diff --git a/commandline.c b/commandline.c
index 94d2c4f..247370f 100644
--- a/commandline.c
+++ b/commandline.c
@@ -65,7 +65,7 @@ int parseArgs(
 				switch( option_index ){
 					case 2: // --version
 						printf( VERSIONSTRING );
-					return 0;
+					return 1;
 					case 6: // --slow-calcWins
 						free( *wins );
 						*wins = NULL;
@@ -80,8 +80,7 @@ int parseArgs(
 							argv[0],
 							long_options[ option_index ].name
 						 );
-						 return -1;
-					break;
+					 return -1;
 				}
 			break;
 			case 'h': // --help
@@ -99,7 +98,7 @@ int parseArgs(
 "      --slow-calcwins  Use the reference implementation of calcWins()\n"
 "      --random-moves   Play random moves instead of asking for input\n"
 				);
-			return 0;
+			return 1;
 			case 'l': // --license
 				for(
 					char *p = _binary_LICENSE_start;
@@ -108,7 +107,7 @@ int parseArgs(
 				){
 					putchar( *p );
 				}
-			return 0;
+			return 1;
 			case 'c': // --columns
 				board->columns = (columnsint_t)atoi(optarg);
 			break;
@@ -126,6 +125,7 @@ int parseArgs(
 					return -1;
 				}
 			break;
+			case '?': return -1;
 		}
 	}
 	// Check for unhandled options
diff --git a/connect4.c b/connect4.c
index fe991e9..7152e57 100644
--- a/connect4.c
+++ b/connect4.c
@@ -57,6 +57,7 @@ int main(
 			&randomMoves
 		)
 	){
+		case -1: return -1;
 		case 0: break;
 		case 1: return 0;
 		default: return -1;
diff --git a/macros.h b/macros.h
index 2ecd282..195f24c 100644
--- a/macros.h
+++ b/macros.h
@@ -8,7 +8,7 @@
 #define XSTR(s) STR(s)
 #define STR(s) #s
 
-#define VERSION 0.3.1
+#define VERSION 0.3.2
 
 #ifndef GITHASH
 #define FULLVERSION VERSION