diff --git a/core/IO.carp b/core/IO.carp
index 7ae95737..e62e0718 100644
--- a/core/IO.carp
+++ b/core/IO.carp
@@ -77,6 +77,8 @@ module are wrappers around the C standard library.")
     (register SEEK-END Int "SEEK_END")
     (doc      ftell "gets the position indicator of a file (thin wrapper for the C standard library).")
     (register ftell (Fn [(Ptr FILE)] Int) "ftell")
+    (register feof (Fn [(Ptr FILE)] Bool) "feof")
+    (register ferror (Fn [(Ptr FILE)] Bool) "ferror")
   )
 
   (doc      println "prints a string ref to stdout, appends a newline.")
@@ -90,7 +92,13 @@ module are wrappers around the C standard library.")
   (doc      get-line "gets a line from stdin.")
   (register get-line (Fn [] String))
   (doc      fgetc "gets a character from a file pointer (thin wrapper for the C standard library).")
-  (register fgetc (Fn [(Ptr FILE)] Char)) ; TODO: check EOF handling (see carp_io.h)!
+  (defn fgetc [file]
+    (let [char (IO.Raw.fgetc file)]
+      (if (IO.Raw.feof file)
+          (Result.Error @"couldn't read char from file, EOF reached")
+          (if (IO.Raw.ferror file)
+              (Result.Error @"error while reading char from file")
+              (Result.Success (Char.from-int char))))))
 
   (doc open-file "opens a file by name using a mode (e.g. [r]ead, [w]rite, [a]ppend),  [rb] read binary...). See fopen() in the C standard library for a detailed description of valid parameters.")
   (defn open-file [filename mode]