diff --git a/gidubba.asm b/gidubba.asm
index 1c18f4b..46e3cfc 100644
--- a/gidubba.asm
+++ b/gidubba.asm
@@ -561,8 +561,15 @@ read:   load    r0, svstrt
         load    r0, svstrt + 1
         store   chrsto + 2, r0
 
-        ;Read and store a character
+        ;Read a character
 chread: load    r1, fffd
+
+        ;Check for empty tape reader
+        xor     r2, r2
+        brneq   r1, r2, chrsto
+        load    r1, sub
+
+        ;Store a character
 chrsto: store   buffer + 100, r1
 
         ;Check for the save end