diff --git a/p2pApp/gwmain.cpp b/p2pApp/gwmain.cpp
index 8a4b5d5..1ada367 100644
--- a/p2pApp/gwmain.cpp
+++ b/p2pApp/gwmain.cpp
@@ -73,6 +73,9 @@ void getargs(ServerConfig& arg, int argc, char *argv[])
     while( (opt=getopt(argc, argv, "qvhiIC"))!=-1)
     {
         switch(opt) {
+        case 'h':
+            usage(argv[0]);
+            exit(0);
         case 'q':
             arg.debug--;
             break;
@@ -90,9 +93,8 @@ void getargs(ServerConfig& arg, int argc, char *argv[])
             break;
         default:
             std::cerr<<"Unknown argument -"<<char(opt)<<"\n";
-        case 'h':
             usage(argv[0]);
-            exit(0);
+            exit(1);
         }
     }