diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index 4979c2e61..8cf8561a2 100644
Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ
diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m
index cf60a6b03..538411cbf 100644
--- a/macosx/NSStringAdditions.m
+++ b/macosx/NSStringAdditions.m
@@ -104,7 +104,7 @@
 
 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds
 {
-    return [NSString timeString: seconds showSeconds:showSeconds maxDigits: INT_MAX];
+    return [NSString timeString: seconds showSeconds:showSeconds maxDigits: UINT_MAX];
 }
 
 + (NSString *) timeString: (uint64_t) seconds showSeconds: (BOOL) showSeconds maxDigits: (NSUInteger) max
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 7c732198e..615211584 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -992,11 +992,10 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     
     if ([self isError])
     {
+        string = NSLocalizedString(@"Error", "Torrent -> status string");
         NSString * errorString = [self errorMessage];
-        if (!errorString || [errorString isEqualToString: @""])
-            string = NSLocalizedString(@"Error", "Torrent -> status string");
-        else
-            string = [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString: errorString];
+        if (errorString && ![errorString isEqualToString: @""])
+            string = [NSString stringWithFormat: @"%@: %@", string, errorString];
     }
     else
     {