diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index 5db54d7a9..07692549f 100644
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -61,6 +61,7 @@
         
         fPath = [path retain];
         fInfo = tr_metaInfoBuilderCreate(handle, [fPath UTF8String]);
+        
         if (fInfo->fileCount == 0)
         {
             NSAlert * alert = [[NSAlert alloc] init];
@@ -77,6 +78,22 @@
             [self release];
             return nil;
         }
+        if (fInfo->totalSize == 0)
+        {
+            NSAlert * alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Create torrent -> zero size -> button")];
+            [alert setMessageText: NSLocalizedString(@"The total file size is zero bytes.",
+                                                    "Create torrent -> zero size -> title")];
+            [alert setInformativeText: NSLocalizedString(@"A torrent file cannot be created for files with no size.",
+                                                        "Create torrent -> zero size -> warning")];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            [alert runModal];
+            [alert release];
+            
+            [self release];
+            return nil;
+        }
         
         fDefaults = [NSUserDefaults standardUserDefaults];
     }
diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index 06bf93cfc..3b7196707 100644
Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ