diff --git a/Makefile.unittests b/Makefile.unittests
index 73f7ab2f42..5375580eb1 100644
--- a/Makefile.unittests
+++ b/Makefile.unittests
@@ -59,7 +59,7 @@ start-server:
 
 	@rm -f "$(PIDFILE)"
 	@rm -rf "$(VOCDIR)"
-	@mkdir "$(VOCDIR)"
+	@mkdir -p "$(VOCDIR)"
 
 	($(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &
 
diff --git a/VocBase/index.c b/VocBase/index.c
index d77afab61e..194b91248d 100644
--- a/VocBase/index.c
+++ b/VocBase/index.c
@@ -1057,6 +1057,7 @@ TRI_index_t* TRI_CreateGeo1Index (struct TRI_doc_collection_s* collection,
   }
 
   ln = TRI_DuplicateString(locationName);
+  // TODO: ln might be NULL
 
   TRI_InitVectorString(&geo->base._fields, TRI_UNKNOWN_MEM_ZONE);
 
diff --git a/html/admin/index.html b/html/admin/index.html
index be838cd8cd..f972147627 100644
--- a/html/admin/index.html
+++ b/html/admin/index.html
@@ -391,15 +391,6 @@
 
       <div id="avocshView" style="display: none">
         <div id="avocshWindow">
-          <pre id="welcomemsg" style="font-family: 'courier';">
-                                         _     
-    __ _ _ __ __ _ _ __   __ _  ___  ___| |__   
-   / _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \   
-  | (_| | | | (_| | | | | (_| | (_) \__ \ | | | 
-   \__,_|_|  \__,_|_| |_|\__, |\___/|___/_| |_| 
-                         |___/
-  
-  Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH.</pre><br><br> 
         </div>
         <form>
           <input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button>
diff --git a/html/admin/js/master.js b/html/admin/js/master.js
index b40e9e0380..bbdd90656a 100644
--- a/html/admin/js/master.js
+++ b/html/admin/js/master.js
@@ -2,6 +2,15 @@
 /// master.js 
 /// arangodb js api  
 ///////////////////////////////////////////////////////////////////////////////
+var welcomeMSG = "" 
++ "                                        _      \n"
++ "   __ _ _ __ __ _ _ __   __ _  ___  ___| |__   \n"
++ "  / _` | '__/ _` | '_ \\ / _` |/ _ \\/ __| '_ \\  \n"
++ " | (_| | | | (_| | | | | (_| | (_) \\__ \\ | | | \n"
++ "  \\__,_|_|  \\__,_|_| |_|\\__, |\\___/|___/_| |_| \n"
++ "                        |___/                  \n"
++ "                                               \n"
++ "Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH."
 
 // documents global vars
 var collectionCount;
@@ -11,6 +20,7 @@ var globalCollectionName;
 var globalCollectionID;
 var globalCollectionRev;
 var checkCollectionName; 
+var printedHelp = false; 
 var open = false;
 var rowCounter = 0; 
 
@@ -706,6 +716,10 @@ var logTable = $('#logTableID').dataTable({
       $('#avocshView').show();
       createnav ("ArangoDB Shell"); 
       $('#avocshContent').focus();
+      if (printedHelp === false) {
+        print(welcomeMSG + HELP);
+        printedHelp = true; 
+      }
     }
 
 ///////////////////////////////////////////////////////////////////////////////