diff --git a/bstr_diff2.c b/bstr_diff2.c
index ff6db21..c31b172 100644
--- a/bstr_diff2.c
+++ b/bstr_diff2.c
@@ -7,7 +7,12 @@ int bstr_diff2(const char* a,const char* b,unsigned int blen) {
   const char* A,* B;
   int j;
   /* like str_diff, just for bstrs */
-  if (*a) A=a+str_len(a); else { A=a+5+uint32_read(a+1); a+=5; }
+  if (*a)
+    A=a+str_len(a);
+  else {
+    A=a+5+uint32_read(a+1);
+    a+=5;
+  }
   B=b+blen;
   for (;;) {
     if (a==A) {
diff --git a/parse.c b/parse.c
index adfea05..651a6da 100644
--- a/parse.c
+++ b/parse.c
@@ -53,10 +53,18 @@ int main(int argc,char* argv[]) {
   char* map,* dest;
 
   if ((fd=open(destname,O_RDWR|O_CREAT|O_TRUNC,0600))<0) {
-    buffer_putsflush(buffer_2,"could not create destination data file");
+    buffer_puts(buffer_2,"could not create destination data file ");
+derrout:
+    buffer_puts(buffer_2,destname);
+    buffer_puts(buffer_2,": ");
+    buffer_puterror(buffer_2);
+    buffer_putnlflush(buffer_2);
     return 1;
   }
-  mstorage_init_persistent(&stringtable,fd);
+  if (mstorage_init_persistent(&stringtable,fd)==-1) {
+    buffer_puts(buffer_2,"mstorage_init_persistent: error mmapping ");
+    goto derrout;
+  }
   mduptab_init(&attributes);
   mduptab_init(&classes);