diff --git a/Source/NSBitmapImageRep.m b/Source/NSBitmapImageRep.m
index 4c1d4237f..3d4b0838f 100644
--- a/Source/NSBitmapImageRep.m
+++ b/Source/NSBitmapImageRep.m
@@ -61,10 +61,17 @@
 + (BOOL) canInitWithData: (NSData *)data
 {
   TIFF	*image = NULL;
-  image = NSTiffOpenDataRead((char *)[data bytes], [data length]);
-  NSTiffClose(image);
+  image = NSTiffOpenDataRead ((char *)[data bytes], [data length]);
 
-  return (image) ? YES : NO;
+  if (image != NULL)
+    {
+      NSTiffClose (image);
+      return YES;
+    }
+  else
+    {
+      return NO;
+    }
 }
 
 + (NSArray *) imageUnfilteredFileTypes