diff --git a/solutions/java/calculator-conundrum/2/src/main/java/CalculatorConundrum.java b/solutions/java/calculator-conundrum/2/src/main/java/CalculatorConundrum.java
new file mode 100644
index 0000000..b652b41
--- /dev/null
+++ b/solutions/java/calculator-conundrum/2/src/main/java/CalculatorConundrum.java
@@ -0,0 +1,27 @@
+class CalculatorConundrum {
+    public String calculate(int operand1, int operand2, String operation) {
+        int result ;
+        switch(operation){
+            case "+" : result = operand1 + operand2;
+                break;
+            case "*" : result = operand1 * operand2;
+                break;
+            case "/" : 
+                try{
+                    result = operand1 / operand2;
+                }
+                catch(ArithmeticException e){
+                    throw new IllegalOperationException("Division by zero is not allowed",e);
+                }
+                break;
+            case null :
+                 throw new IllegalArgumentException("Operation cannot be null");
+            case "" :
+                 throw new IllegalArgumentException("Operation cannot be empty");
+            default :
+                throw new IllegalOperationException("Operation '" + operation + "' does not exist");
+        }
+        return operand1 + " " + operation + " " + operand2 + " = " + result;
+
+    }
+}