diff --git a/README.md b/README.md
index 0807ba2..79cbf36 100644
--- a/README.md
+++ b/README.md
@@ -11,17 +11,17 @@ See https://www.semantics3.com for more information.
     <dependency>
         <groupId>com.semantics3</groupId>
         <artifactId>Sem3Java</artifactId>
-        <version>1.2.2</version>
+        <version>1.2.4</version>
     </dependency>
 ```
 
-* For projects which don't use Maven each stable [release](https://github.com/Semantics3/semantics3-java/releases/download/Sem3Java-1.2.2/Sem3Java-1.2.2-jar-with-dependencies.jar) is also available as a fat jar.
+* For projects which don't use Maven each stable [release](https://github.com/Semantics3/semantics3-java/releases/download/Sem3Java-1.2.4/Sem3Java-1.2.4-jar-with-dependencies.jar) is also available as a fat jar.
 
 ## Getting Started
 
 In order to use the client, you must have both an API key and an API secret. To obtain your key and secret, you need to first create an account at
 https://www.semantics3.com/
-You can access your API access credentials from the user dashboard at https://www.semantics3.com/dashboard/applications
+You can access your API access credentials from the user dashboard at https://dashboard.semantics3.com.
 
 ### Setup Work
 
diff --git a/pom.xml b/pom.xml
index a300dd7..cea89bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.semantics3</groupId>
     <artifactId>Sem3Java</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.5-SNAPSHOT</version>
     <name>Semantics3 Java Library</name>
     <url>https://github.com/Semantics3/semantics3-java</url>
     <description>Java bindings for Semantics3 API</description>
@@ -147,7 +147,7 @@
         <connection>scm:git:git://github.com/Semantics3/semantics3-java.git</connection>
         <developerConnection>scm:git:git@github.com:Semantics3/semantics3-java.git</developerConnection>
         <url>https://github.com/Semantics3/semantics3-java</url>
-        <tag>Sem3Java-1.2.3</tag>
+        <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>
diff --git a/src/main/java/com/semantics3/api/Semantics3Request.java b/src/main/java/com/semantics3/api/Semantics3Request.java
index c5cce25..f3c3b87 100644
--- a/src/main/java/com/semantics3/api/Semantics3Request.java
+++ b/src/main/java/com/semantics3/api/Semantics3Request.java
@@ -99,7 +99,13 @@ protected JSONObject fetch(String endpoint, String params) throws
         catch (IOException e) {
             InputStream error = ((HttpURLConnection) request).getErrorStream();
             JSONObject json = new JSONObject(new JSONTokener(error));
-            json.put("code", "Error");
+            if (!json.has("code")) {
+                json.put("code", "Error");
+            }
+            else {
+                Object value = json.get("code");
+                json.put("code", value.toString());
+            }
             return json;
         }
 	}
@@ -145,7 +151,13 @@ protected JSONObject fetch(String endpoint, String method, HashMap<String, Objec
         catch (IOException e) {
             InputStream error = ((HttpURLConnection) request).getErrorStream();
             JSONObject json = new JSONObject(new JSONTokener(error));
-            json.put("code", "Error");
+            if (!json.has("code")) {
+                json.put("code", "Error");
+            }
+            else {
+                Object value = json.get("code");
+                json.put("code", value.toString());
+            }
             return json;
         }
     }
@@ -219,10 +231,10 @@ protected void runQuery(String endpoint) throws
 				
 		}
 		this.queryResult = fetch(endpoint,q.toString());
-		if (!this.queryResult.getString("code").equals("OK")) {
-			throw new Semantics3Exception(
+        if (!this.queryResult.getString("code").equals("OK")) {
+            throw new Semantics3Exception(
 					this.queryResult.getString("code"),
-					this.queryResult.getString("message")
+                    String.format("Error Code: %s %s", this.queryResult.getString("code"),this.queryResult.getString("message"))
 				);
 			
 		}
diff --git a/src/test/java/com/semantics3/api/ProductsTest.java b/src/test/java/com/semantics3/api/ProductsTest.java
index c14de75..7eab00f 100644
--- a/src/test/java/com/semantics3/api/ProductsTest.java
+++ b/src/test/java/com/semantics3/api/ProductsTest.java
@@ -1,5 +1,6 @@
 package com.semantics3.api;
 
+import com.semantics3.errors.Semantics3Exception;
 import oauth.signpost.exception.OAuthCommunicationException;
 import oauth.signpost.exception.OAuthExpectationFailedException;
 import oauth.signpost.exception.OAuthMessageSignerException;
@@ -68,13 +69,7 @@ public void TestCategoryIDQuery() throws OAuthExpectationFailedException, OAuthC
         Properties property = TestUtils.getConfig("api.config");
         Products products = new Products(property.get("API_KEY").toString(), property.get("API_SECRET").toString());
         products
-                .categoriesField("cat_id", 4992);
-        JSONObject results = products.getCategories();
-        JSONArray resultsArray = (JSONArray) results.get("results");
-        assertThat(resultsArray.length() > 0, is(true));
-    }
-
-    @Test
+                .categoriesField("cat_id", 4992); JSONObject results = products.getCategories(); JSONArray resultsArray = (JSONArray) results.get("results"); assertThat(resultsArray.length() > 0, is(true)); }  @Test
     public void TestSKUQuery() throws OAuthExpectationFailedException, OAuthCommunicationException, OAuthMessageSignerException, IOException, URISyntaxException {
         Properties property = TestUtils.getConfig("api.config");
         Semantics3Request semantics3Request = new Semantics3Request(property.get("API_KEY").toString(), property.get("API_SECRET").toString());
@@ -85,6 +80,14 @@ public void TestSKUQuery() throws OAuthExpectationFailedException, OAuthCommunic
         assertThat(resultsArray.length() > 0, is(true));
     }
 
+    @Test(expected = Semantics3Exception.class)
+    public void TestSiteQuery() throws IOException, OAuthExpectationFailedException, OAuthCommunicationException, OAuthMessageSignerException, URISyntaxException {
+        Properties property = TestUtils.getConfig("api.config");
+        Products products = new Products(property.get("API_KEY").toString(), property.get("API_SECRET").toString());
+        products .productsField("url", "zsdfseobn.com/sdgeafg");
+        JSONObject results = products.getProducts();
+    }
+
     @Ignore
     public void TestPagination() throws IOException, OAuthCommunicationException, OAuthExpectationFailedException, OAuthMessageSignerException, URISyntaxException {
         Properties property = TestUtils.getConfig("api.config");