diff --git a/Windows/Debugger/ExpressionParser.cpp b/Windows/Debugger/ExpressionParser.cpp
index fab99502bb..11ea3f63ec 100644
--- a/Windows/Debugger/ExpressionParser.cpp
+++ b/Windows/Debugger/ExpressionParser.cpp
@@ -382,9 +382,19 @@ bool parseExpression(char* infix, DebugInterface* cpu, u32& dest)
 				valueStack.push_back(arg[1]*arg[0]);
 				break;
 			case EXOP_DIV:			// a/b
+				if (arg[0] == 0)
+				{
+					sprintf(expressionError,"Division by zero");
+					return false;
+				}
 				valueStack.push_back(arg[1]/arg[0]);
 				break;
 			case EXOP_MOD:			// a%b
+				if (arg[0] == 0)
+				{
+					sprintf(expressionError,"Modulo by zero");
+					return false;
+				}
 				valueStack.push_back(arg[1]%arg[0]);
 				break;
 			case EXOP_ADD:			// a+b