diff --git a/build.gradle.kts b/build.gradle.kts
index e4f36cb..fd95ad5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ allprojects {
     apply(plugin = "com.gradleup.shadow")
 
     group = "dev.shiza"
-    version = "1.0.0"
+    version = "1.0.1"
 
     repositories {
         mavenCentral()
diff --git a/itemshopsys-bungee/build.gradle.kts b/itemshopsys-bungee/build.gradle.kts
index d049e0d..d45b611 100644
--- a/itemshopsys-bungee/build.gradle.kts
+++ b/itemshopsys-bungee/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 }
 
 bungee {
-    main = "dev.shiza.itemshopsys.bukkit.ItemShopBungeePlugin"
+    main = "dev.shiza.itemshopsys.bungee.ItemShopBungeePlugin"
     name = "itemshopsys"
     version = project.version.toString()
     author = "shiza"
diff --git a/itemshopsys-common/src/dev/shiza/itemshopsys/client/http/HttpItemShopClient.java b/itemshopsys-common/src/dev/shiza/itemshopsys/client/http/HttpItemShopClient.java
index 79ce2ae..e35b68a 100644
--- a/itemshopsys-common/src/dev/shiza/itemshopsys/client/http/HttpItemShopClient.java
+++ b/itemshopsys-common/src/dev/shiza/itemshopsys/client/http/HttpItemShopClient.java
@@ -45,6 +45,11 @@ public ExecutableCommands retrieveCommands(final String shopId, final String ser
             .routeParam("shopId", shopId)
             .routeParam("serverId", serverId)
             .asObject(ExecutableCommands.class);
+
+    if (response.getStatus() == 200) {
+      return response.getBody();
+    }
+
     switch (response.getStatus()) {
       case 429:
         logger.debug("Rate limit exceeded, commands could not be retrieved.");
@@ -52,10 +57,16 @@ public ExecutableCommands retrieveCommands(final String shopId, final String ser
       case 503:
         logger.debug("Service unavailable, commands could not be retrieved.");
         return EMPTY_COMMANDS;
+      case 400:
+        logger.debug("Server token is invalid or is empty, commands could not be retrieved.");
+        return EMPTY_COMMANDS;
+      case 404:
+        logger.debug("Invalid shop or server parameters, commands could not be retrieved. Make sure that you have passed them correctly.");
+        return EMPTY_COMMANDS;
       default:
-        break;
+        logger.debug("Received unknown HTTP status from ItemShopSys API during commands fetching. Received status code: " + response.getStatus());
+        return EMPTY_COMMANDS;
     }
-    return response.getBody();
   }
 
   @Override