diff --git a/fail2ban-server b/fail2ban-server
index 1f022d13..7602bd85 100755
--- a/fail2ban-server
+++ b/fail2ban-server
@@ -71,15 +71,16 @@ class Fail2banServer:
 		print "and bans the corresponding IP addresses using firewall rules."
 		print
 		print "Only use this command for debugging purpose. Start the server with"
-		print "fail2ban-client instead."
+		print "fail2ban-client instead. The default behaviour is to start the server"
+		print "in background."
 		print
 		print "Options:"
-		print "  -b             start in background"
-		print "  -f             start in foreground"
-		print "  -s <FILE>      socket path"
-		print "  -x             force execution of the server"
-		print "  -h, --help     display this help message"
-		print "  -V, --version  print the version"
+		print "    -b                   start in background"
+		print "    -f                   start in foreground"
+		print "    -s <FILE>            socket path"
+		print "    -x                   force execution of the server"
+		print "    -h, --help           display this help message"
+		print "    -V, --version        print the version"
 		print
 		print "Report bugs to <lostcontrol@users.sourceforge.net>"
 	
@@ -113,6 +114,7 @@ class Fail2banServer:
 			optList, args = getopt.getopt(self.__argv[1:], cmdOpts, cmdLongOpts)
 		except getopt.GetoptError:
 			self.dispUsage()
+			sys.exit(-1)
 			
 		self.__getCmdLineOptions(optList)