diff --git a/GLFileView.m b/GLFileView.m
index 6d4e7e5..92baab9 100644
--- a/GLFileView.m
+++ b/GLFileView.m
@@ -242,6 +242,8 @@
 
 + (NSString *) escapeHTML:(NSString *)txt
 {
+    if (txt == nil)
+        return txt;
     NSMutableString *newTxt = [NSMutableString stringWithString:txt];
 	[newTxt replaceOccurrencesOfString:@"&" withString:@"&" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
 	[newTxt replaceOccurrencesOfString:@"<" withString:@"&lt;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
index a870c30..d6ea41c 100644
--- a/PBWebHistoryController.m
+++ b/PBWebHistoryController.m
@@ -107,11 +107,11 @@
 	NSMutableDictionary *stats=[self parseStats:details];
 
 	// File list
-	NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]];
+	NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]];
 	NSString *fileList=[GLFileView parseDiffTree:dt withStats:stats];
 	
 	// Diffs list
-	NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]];
+	NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]];
 	NSString *diffs=[GLFileView parseDiff:d];
 	
 	NSString *html=[NSString stringWithFormat:@"%@%@<div id='diffs'>%@</div>",header,fileList,diffs];