diff --git a/main.cpp b/main.cpp
index a495fc94..23d2a8ce 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,8 +12,15 @@ int main()
     std::cout << "Addition: " << x + y << std::endl;
     std::cout << "Subtraction: " << x - y << std::endl;
     std::cout << "Multiplication: " << x * y << std::endl;
-    std::cout << "Division: " << x / y << std::endl;
-    std::cout << "Remainder: " << x % y << std::endl;
+
+    if(y == 0) {
+        std::cout << "Dividing by zero is not a number." << std::endl;
+    }
+    else {
+        std::cout << "Division: " << x / y << std::endl;
+        std::cout << "Remainder: " << x % y << std::endl;
+    }
+
     std::cout << "Square Root: " << sqrt(x) << std::endl;
     std::cout << "Square: " << pow(x, y) << std::endl;