diff --git a/Storage/Tape/Tape.cpp b/Storage/Tape/Tape.cpp
index 387ee9391..616ad65f3 100644
--- a/Storage/Tape/Tape.cpp
+++ b/Storage/Tape/Tape.cpp
@@ -94,7 +94,7 @@ void TapePlayer::set_tape(std::shared_ptr<Storage::Tape::Tape> tape, TargetPlatf
 }
 
 bool TapePlayer::is_at_end() const {
-	return serialiser_->is_at_end();
+	return !serialiser_ || serialiser_->is_at_end();
 }
 
 TapeSerialiser *TapePlayer::serialiser() {