diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
index f22e6bda..770ee27f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java
@@ -40,7 +40,7 @@ public class ListExtensionsCommand extends VFPViaSubCommand {
 
     @Override
     public boolean execute(ViaCommandSender sender, String[] args) {
-        if (!getUser().has(ExtensionProtocolMetadataStorage.class)) {
+        if (getUser() == null || !getUser().has(ExtensionProtocolMetadataStorage.class)) {
             sendMessage(sender, Formatting.RED + "Only for " + LegacyProtocolVersion.c0_30cpe.getName());
             return true;
         }
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
index f181bec6..d76c8721 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java
@@ -44,7 +44,7 @@ public class SetTimeCommand extends VFPViaSubCommand {
 
     @Override
     public boolean execute(ViaCommandSender sender, String[] args) {
-        if (!getUser().has(TimeLockStorage.class)) {
+        if (getUser() == null || !getUser().has(TimeLockStorage.class)) {
             sendMessage(sender, Formatting.RED + "Only for <= " + LegacyProtocolVersion.a1_0_16toa1_0_16_2.getName());
             return true;
         }