diff --git a/Calculator/saikrishna823/calculator.js b/Calculator/saikrishna823/calculator.js
index 6b8a64f0e..d0bf8f123 100644
--- a/Calculator/saikrishna823/calculator.js
+++ b/Calculator/saikrishna823/calculator.js
@@ -1,16 +1,71 @@
-let inputBtn=document.getElementById("inputBtn")
-let buttons=document.querySelectorAll(".button");
-const evalButton=document.getElementById("evalButton");
-const clearBtn=document.querySelector(".clearBtn");
-buttons.forEach((button)=>{
- button.onclick=()=>{
-        inputBtn.value+=button.textContent;
-    }
-    })
-;
-evalButton.onclick=()=>{
-    inputBtn.value=eval(inputBtn.value);
-}
-clearBtn.onclick=()=>{
-    inputBtn.value=" ";
-}
\ No newline at end of file
+const inputBtn = document.getElementById("inputBtn");
+const buttons = document.querySelectorAll(".button");
+const evalButton = document.getElementById("evalButton");
+const clearBtn = document.querySelector(".clearBtn");
+
+const operators = ["+", "-", "*", "/"];
+
+function showError(message) {
+  inputBtn.value = message;
+  inputBtn.classList.add("error");
+}
+
+function clearError() {
+  inputBtn.classList.remove("error");
+  if (inputBtn.value === "Invalid input" || inputBtn.value === "Cannot divide by zero") {
+    inputBtn.value = "";
+  }
+}
+
+function isValidExpression(expression) {
+  if (!expression) {
+    return false;
+  }
+
+  if (!/^[0-9+\-*/. ]+$/.test(expression)) {
+    return false;
+  }
+
+  const firstCharacter = expression.charAt(0);
+  const lastCharacter = expression.charAt(expression.length - 1);
+
+  if (operators.includes(firstCharacter) || operators.includes(lastCharacter)) {
+    return false;
+  }
+
+  return !/[+\-*/]{2,}/.test(expression);
+}
+
+buttons.forEach((button) => {
+  button.onclick = () => {
+    clearError();
+    inputBtn.value += button.textContent;
+  };
+});
+
+evalButton.onclick = () => {
+  clearError();
+
+  const expression = inputBtn.value.trim();
+  if (!isValidExpression(expression)) {
+    showError("Invalid input");
+    return;
+  }
+
+  try {
+    const result = Function(`"use strict"; return (${expression})`)();
+    if (!Number.isFinite(result)) {
+      showError("Cannot divide by zero");
+      return;
+    }
+
+    inputBtn.value = result;
+  } catch (error) {
+    showError("Invalid input");
+  }
+};
+
+clearBtn.onclick = () => {
+  inputBtn.value = "";
+  inputBtn.classList.remove("error");
+};
diff --git a/Calculator/saikrishna823/styles.css b/Calculator/saikrishna823/styles.css
index 43d1942d0..bc8919aa0 100644
--- a/Calculator/saikrishna823/styles.css
+++ b/Calculator/saikrishna823/styles.css
@@ -48,16 +48,20 @@ body{
 #evalButton:hover,focus,active{
     outline: none;
 }
-#inputBtn{
-    border-radius:4px;
-    height:28px;
-    width:220px;
-}
-.clearBtn{
-    border-radius:3px;
-    padding:2px;
+#inputBtn{
+    border-radius:4px;
+    height:28px;
+    width:220px;
+}
+#inputBtn.error{
+    color: #b91c1c;
+    border: 2px solid #b91c1c;
+}
+.clearBtn{
+    border-radius:3px;
+    padding:2px;
     text-align: center;
     font-size: larger;
     color: white;
     background-color:rgb(239, 14, 194);
-}
\ No newline at end of file
+}