diff --git a/evmcc/test/except/badinst1.evm b/evmcc/test/except/badinst1.evm
new file mode 100644
index 000000000..69aadac5e
--- /dev/null
+++ b/evmcc/test/except/badinst1.evm
@@ -0,0 +1 @@
+4a
diff --git a/libevmjit/Compiler.cpp b/libevmjit/Compiler.cpp
index 0b9fb5b7b..02c8db715 100644
--- a/libevmjit/Compiler.cpp
+++ b/libevmjit/Compiler.cpp
@@ -816,6 +816,11 @@ void Compiler::compileBasicBlock(BasicBlock& basicBlock, bytesConstRef bytecode,
 			break;
 		}
 
+		default: // Invalid instruction - runtime exception
+		{
+			_runtimeManager.raiseException(ReturnCode::BadInstruction);
+		}
+
 		}
 	}
 
diff --git a/libevmjit/Type.h b/libevmjit/Type.h
index 86915cd9e..b432f0813 100644
--- a/libevmjit/Type.h
+++ b/libevmjit/Type.h
@@ -43,7 +43,8 @@ enum class ReturnCode
 
 	BadJumpDestination = 101,
 	OutOfGas = 102,
-	StackTooSmall = 103
+	StackTooSmall = 103,
+	BadInstruction = 104,
 };
 
 struct Constant
diff --git a/libevmjit/VM.cpp b/libevmjit/VM.cpp
index dd54dd0e5..0907682d2 100644
--- a/libevmjit/VM.cpp
+++ b/libevmjit/VM.cpp
@@ -5,6 +5,7 @@
 
 #include "ExecutionEngine.h"
 #include "Compiler.h"
+#include "Type.h"
 
 namespace dev
 {
@@ -20,14 +21,16 @@ bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const&, uint64_t)
 	ExecutionEngine engine;
 	auto exitCode = engine.run(std::move(module), m_gas, &_ext);
 
-	switch (exitCode)
+	switch (static_cast<ReturnCode>(exitCode))
 	{
-	case 101:
+	case ReturnCode::BadJumpDestination:
 		BOOST_THROW_EXCEPTION(BadJumpDestination());
-	case 102:
+	case ReturnCode::OutOfGas:
 		BOOST_THROW_EXCEPTION(OutOfGas());
-	case 103:
+	case ReturnCode::StackTooSmall:
 		BOOST_THROW_EXCEPTION(StackTooSmall(1,0));
+	case ReturnCode::BadInstruction:
+		BOOST_THROW_EXCEPTION(BadInstruction());
 	}
 
 	m_output = std::move(engine.returnData);