diff --git a/lib/mu-index.c b/lib/mu-index.c
index b8726f17..3b42dc50 100644
--- a/lib/mu-index.c
+++ b/lib/mu-index.c
@@ -320,8 +320,8 @@ mu_index_run (MuIndex *index, const char *path,
 	      MuIndexMsgCallback msg_cb, MuIndexDirCallback dir_cb,
 	      void *user_data)
 {
-	MuIndexCallbackData cb_data;
-	MuError rv;
+	MuIndexCallbackData	cb_data;
+	MuError			rv;
 
 	g_return_val_if_fail (index && index->_store, MU_ERROR);
 	g_return_val_if_fail (msg_cb, MU_ERROR);
diff --git a/mu/mu-cmd-index.c b/mu/mu-cmd-index.c
index 2b855800..8a3364f9 100644
--- a/mu/mu-cmd-index.c
+++ b/mu/mu-cmd-index.c
@@ -298,16 +298,16 @@ index_title (const char* maildir, const char* xapiandir, gboolean color)
 			   "]\n", maildir, xapiandir);
 	else
 		g_print ("indexing messages under %s [%s]\n",
-			   maildir, xapiandir);
+			 maildir, xapiandir);
 }
 
 
 static MuError
 cmd_index (MuIndex *midx, MuConfig *opts, MuIndexStats *stats, GError **err)
 {
-	IndexData idata;
-	MuError rv;
-	gboolean show_progress;
+	IndexData	idata;
+	MuError		rv;
+	gboolean	show_progress;
 
 	if (!opts->quiet)
 		index_title (opts->maildir,
@@ -315,8 +315,10 @@ cmd_index (MuIndex *midx, MuConfig *opts, MuIndexStats *stats, GError **err)
 			     !opts->nocolor);
 
 	show_progress = !opts->quiet && isatty(fileno(stdout));
-	idata.color = !opts->nocolor;
+	idata.color   = !opts->nocolor;
+
 	newline_before_on();
+
 	rv = mu_index_run (midx, opts->maildir, opts->rebuild, stats,
 			   show_progress ?
 			   (MuIndexMsgCallback)index_msg_cb :
diff --git a/mu/mu.cc b/mu/mu.cc
index 83f75ab4..7cdaef04 100644
--- a/mu/mu.cc
+++ b/mu/mu.cc
@@ -79,7 +79,9 @@ handle_error (MuConfig *conf, MuError merr, GError **err)
 	}
 
 	if (*err)
-		g_printerr ("mu: %s\n", (*err)->message);
+		g_printerr ("mu: %s (%u)\n",
+			    (*err)->message,
+			    (*err)->code);
 }