diff --git a/CLTool/src/decomp.cpp b/CLTool/src/decomp.cpp
index ba8d9e2..e808acf 100644
--- a/CLTool/src/decomp.cpp
+++ b/CLTool/src/decomp.cpp
@@ -71,7 +71,6 @@ int main(int argc, char **argv) {
 
   ImageFile imgf (argv[1]);
   if(!imgf.Load()) {
-    fprintf(stderr, "Error loading file: %s\n", argv[1]);
     return 1;
   }
 
diff --git a/IO/src/FileStreamUnix.cpp b/IO/src/FileStreamUnix.cpp
index 0124050..775175a 100644
--- a/IO/src/FileStreamUnix.cpp
+++ b/IO/src/FileStreamUnix.cpp
@@ -95,7 +95,9 @@ public:
   }
 
   ~FileStreamImpl() {
-    fclose(m_FilePtr);
+    if (0 != m_FilePtr) {
+      fclose(m_FilePtr);
+    }
   }
 
   void IncreaseReferenceCount() { m_ReferenceCount++; }