diff -r 5f1f7602cf77 -r 9792cfe63b80 dav/optparser.c
--- a/dav/optparser.c	Thu Mar 17 22:02:15 2016 +0100
+++ b/dav/optparser.c	Fri Mar 18 12:38:30 2016 +0100
@@ -33,9 +33,11 @@
 #include "optparser.h"
 
 void cmd_args_free(CmdArgs *args) {
-    ucx_map_free(args->options);
-    free(args->argv);
-    free(args);
+    if(args) {
+        ucx_map_free(args->options);
+        free(args->argv);
+        free(args);
+    }
 }
 
 CmdArgs* cmd_parse_args(int argc, char **argv) {
@@ -55,7 +57,7 @@
             for(int c=1;c<len;c++) {
                 switch(arg[c]) {
                     default: {
-                        fprintf(stderr, "Unknown option -%c", arg[c]);
+                        fprintf(stderr, "Unknown option -%c\n\n", arg[c]);
                         cmd_args_free(a);
                         return NULL;
                     }