diff --git a/.gitignore b/.gitignore
index ef7a2314..965d733d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@
 
 /target
 .classpath
+.idea
 .project
 .settings
+*.iml
 *orig
 .springBeans
 *tmp/
diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml
index 84623107..20234606 100644
--- a/openvidu-java-client/pom.xml
+++ b/openvidu-java-client/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>openvidu-java-client</artifactId>
-	<version>2.12.1</version>
+	<version>2.13.0</version>
 	<packaging>jar</packaging>
 
 	<name>OpenVidu Java Client</name>
diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java
new file mode 100644
index 00000000..2e828540
--- /dev/null
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduException.java
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2017-2020 OpenVidu (https://openvidu.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.openvidu.java.client;
+
+/**
+ * Defines a generic OpenVidu exception
+ */
+public class OpenViduException extends Exception {
+
+	protected OpenViduException(String message) {
+		super(message);
+	}
+
+	protected OpenViduException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduHttpException.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduHttpException.java
index bec440cd..31bb86fd 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduHttpException.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduHttpException.java
@@ -20,7 +20,7 @@ package io.openvidu.java.client;
 /**
  * Defines error responses from OpenVidu Server
  */
-public class OpenViduHttpException extends Exception {
+public class OpenViduHttpException extends OpenViduException {
 
 	private static final long serialVersionUID = 1L;
 	private int status;
diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduJavaClientException.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduJavaClientException.java
index aa8307a2..7c3f8734 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduJavaClientException.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenViduJavaClientException.java
@@ -20,7 +20,7 @@ package io.openvidu.java.client;
 /**
  * Defines unexpected internal errors in OpenVidu Java Client
  */
-public class OpenViduJavaClientException extends Exception {
+public class OpenViduJavaClientException extends OpenViduException {
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduHttpExceptionTest.java b/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduHttpExceptionTest.java
new file mode 100644
index 00000000..15c5d6a4
--- /dev/null
+++ b/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduHttpExceptionTest.java
@@ -0,0 +1,11 @@
+package io.openvidu.java.client;
+
+import org.junit.Test;
+
+public class OpenViduHttpExceptionTest {
+
+    @Test(expected = OpenViduException.class)
+    public void shouldThrowGenericOpenViduException() throws OpenViduHttpException {
+        throw new OpenViduHttpException(401);
+    }
+}
diff --git a/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduJavaClientExceptionTest.java b/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduJavaClientExceptionTest.java
new file mode 100644
index 00000000..23ce0c10
--- /dev/null
+++ b/openvidu-java-client/src/test/java/io/openvidu/java/client/OpenViduJavaClientExceptionTest.java
@@ -0,0 +1,11 @@
+package io.openvidu.java.client;
+
+import org.junit.Test;
+
+public class OpenViduJavaClientExceptionTest {
+
+    @Test(expected = OpenViduException.class)
+    public void shouldThrowGenericOpenViduException() throws OpenViduJavaClientException {
+        throw new OpenViduJavaClientException("message");
+    }
+}