Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision e5f2a6763f1497c623f53576a6d9062fc76189d1)
+++ src/Parser/parser.yy	(revision dc2b4d655aaaa35461ec8941961fc6c9a631cd28)
@@ -9,7 +9,7 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 15 15:59:50 2017
-// Update Count     : 2454
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 17 12:17:00 2017
+// Update Count     : 2455
 //
 
@@ -980,7 +980,7 @@
 		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
 
-	| handler_key '(' push push exception_declaration handler_predicate_opt pop ')' compound_statement pop
+	| handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
 		{ $$ = new StatementNode( build_catch( $1, $5, nullptr, $9 ) ); }
-	| handler_clause handler_key '(' push push exception_declaration handler_predicate_opt pop ')' compound_statement pop
+	| handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
 		{ $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $10 ) ) ); }
 	;
@@ -988,5 +988,5 @@
 handler_predicate_opt:
 	//empty
-	| ':' conditional_expression
+	| ';' conditional_expression
 	;