diff --git a/calculator.py b/calculator.py
index 801ccd6..ce20d1b 100644
--- a/calculator.py
+++ b/calculator.py
@@ -1,44 +1,45 @@
-choice = input("""
-Please select the type of operation you want to perform:
-+ for addition
-- for subtraction
-* for multiplication
-/ for division
-** for exponentiation
-// for floor division
-% for Modulus
-""")
+while True:
+	choice = input("""
+	Please select the type of operation you want to perform:
+	+ for addition
+	- for subtraction
+	* for multiplication
+	/ for division
+	** for exponentiation
+	// for floor division
+	% for Modulus
+	""")
  
-num_1 = int(input("Enter your first number: "))
-num_2 = int(input("Enter your second number: "))
+	num_1 = int(input("Enter your first number: "))
+	num_2 = int(input("Enter your second number: "))
  
-if choice == "+":
-    print("{} + {} = ".format(num_1, num_2))
-    print(num_1 + num_2)
+	if choice == "+":
+    	print("{} + {} = ".format(num_1, num_2))
+    	print(num_1 + num_2)
  
-elif choice == "-":
-    print("{} - {} = ".format(num_1, num_2))
-    print(num_1 - num_2)
+	elif choice == "-":
+    	print("{} - {} = ".format(num_1, num_2))
+    	print(num_1 - num_2)
  
-elif choice == "*":
-    print("{} * {} = ".format(num_1, num_2))
-    print(num_1 * num_2)
+	elif choice == "*":
+    	print("{} * {} = ".format(num_1, num_2))
+    	print(num_1 * num_2)
  
-elif choice == "/":
-    print("{} / {} = ".format(num_1, num_2))
-    print(num_1 / num_2)
+	elif choice == "/":
+    	print("{} / {} = ".format(num_1, num_2))
+    	print(num_1 / num_2)
 
-elif choice == "**":
-    print("{} ** {} = ".format(num_1, num_2))
-    print(num_1 ** num_2)
+	elif choice == "**":
+    	print("{} ** {} = ".format(num_1, num_2))
+    	print(num_1 ** num_2)
 
-elif choice == "//":
-    print("{} // {} = ".format(num_1, num_2))
-    print(num_1 // num_2)
+	elif choice == "//":
+    	print("{} // {} = ".format(num_1, num_2))
+    	print(num_1 // num_2)
 	
-elif choice == "%":
-    print("{} % {} = ".format(num_1, num_2))
-    print(num_1 % num_2)
+	elif choice == "%":
+    	print("{} % {} = ".format(num_1, num_2))
+    	print(num_1 % num_2)
  
-else:
-    print("Enter a valid operator, please run the program again.")
+	except ValueError:
+    	print("Enter a valid operator, please run the program again.")