diff --git a/HackerRankDashboard/Languages/Java/src/main/java/com/javaaid/hackerrank/solutions/languages/java/exceptionhandling/JavaExceptionHandling.java b/HackerRankDashboard/Languages/Java/src/main/java/com/javaaid/hackerrank/solutions/languages/java/exceptionhandling/JavaExceptionHandling.java
index 6520878..0bc34b4 100644
--- a/HackerRankDashboard/Languages/Java/src/main/java/com/javaaid/hackerrank/solutions/languages/java/exceptionhandling/JavaExceptionHandling.java
+++ b/HackerRankDashboard/Languages/Java/src/main/java/com/javaaid/hackerrank/solutions/languages/java/exceptionhandling/JavaExceptionHandling.java
@@ -4,18 +4,18 @@
 package com.javaaid.hackerrank.solutions.languages.java.exceptionhandling;
 
 /**
- * @author Kanahaiya Gupta
+ * @RakeshPatil95
  *
  */
-public class JavaExceptionHandling {
-	int power(int n, int p) throws Exception {
-
-		if (n < 0 || p < 0) {
-			throw new Exception("n and p should be non-negative");
-		} else {
-			return (int) Math.pow(n, p);
-		}
-
-	}
-
+class MyCalculator 
+{
+    long power(int n,int p) throws Exception 
+    {
+        if(n<0 || p<0)
+        throw new Exception("n or p should not be negative.");
+        else if(n==0 || p==0)
+        throw new Exception("n and p should not be zero.");
+        
+        return (long) Math.pow(n,p);
+    } 
 }