diff --git a/Dockerfile.server b/Dockerfile.server
index 79f6a0c..e0d52fb 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -1,6 +1,6 @@
 FROM thebrokenrail/minecraft-pi:client
 
-ENV MCPI_SERVER=1
+ENV MCPI_MODE=server
 
 RUN apt-get install -y xvfb
 
diff --git a/mods/src/extra.c b/mods/src/extra.c
index a7e6a30..052dc62 100644
--- a/mods/src/extra.c
+++ b/mods/src/extra.c
@@ -156,7 +156,9 @@ int extra_has_feature(const char *name) {
 
 int extra_get_mode() {
     char *mode = getenv("MCPI_MODE");
-    if (strcmp("virgl", mode) == 0) {
+    if (mode == NULL) {
+        ERR("%s", "MCPI Mode Not Specified");
+    } else if (strcmp("virgl", mode) == 0) {
         return 0;
     } else if (strcmp("native", mode) == 0) {
         return 1;