diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index f74ad4a8..13045f8c 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -3400,11 +3400,7 @@ impl Machine {
             let result = iter.read_char();
 
             match result {
-                Some(Ok(c)) => {
-                    self.machine_st.unify_char(c, addr);
-                    break;
-                }
-                _ => {
+                Some(Ok('\u{0}')) | Some(Err(_)) | None => {
                     self.machine_st.eof_action(
                         self.machine_st.registers[2],
                         stream,
@@ -3418,6 +3414,10 @@ impl Machine {
                         break;
                     }
                 }
+                Some(Ok(c)) => {
+                    self.machine_st.unify_char(c, addr);
+                    break;
+                }
             }
         }