diff --git a/etomic_build/enable b/etomic_build/enable
index 0bcf62166..f43d63ff7 100755
--- a/etomic_build/enable
+++ b/etomic_build/enable
@@ -1,5 +1,4 @@
 #!/bin/bash
 source userpass
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"ETH\"}"
-curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"KMD\"}"
 curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"ETOMIC\"}"
+curl --url "http://127.0.0.1:7783" --data "{\"userpass\":\"$userpass\",\"method\":\"enable\",\"coin\":\"ETH\"}"
diff --git a/etomic_build/userpass b/etomic_build/userpass
index d097e0445..19fc21189 100644
--- a/etomic_build/userpass
+++ b/etomic_build/userpass
@@ -1,2 +1,2 @@
 #export userpass="<put the userpass value from the first API call here>"
-export userpass="c3d8c2a364b7d18c1f9d7321d017b92e9f9c791e4f5c741214fefdea8a071256"
+export userpass="$USERPASS"
diff --git a/iguana/exchanges/etomicswap/etomiccurl.c b/iguana/exchanges/etomicswap/etomiccurl.c
index a43e2c292..a547111e0 100644
--- a/iguana/exchanges/etomicswap/etomiccurl.c
+++ b/iguana/exchanges/etomicswap/etomiccurl.c
@@ -43,7 +43,7 @@ cJSON *parseEthRpcResponse(char *requestResult)
     cJSON *tmp = cJSON_GetObjectItem(json, "result");
     cJSON *error = cJSON_GetObjectItem(json, "error");
     cJSON *result = NULL;
-    if (!is_cJSON_Null(tmp)) {
+    if (tmp != NULL && !is_cJSON_Null(tmp)) {
         result = cJSON_Duplicate(tmp, 1);
     } else if (error != NULL && !is_cJSON_Null(error)) {
         char *errorString = cJSON_PrintUnformatted(error);