diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh
index 5aa513a..fcddc8c 100644
--- a/neoforged/Install_Script.sh
+++ b/neoforged/Install_Script.sh
@@ -104,15 +104,25 @@ cd $MC_DIR
 # exec ./run-$NEOFORGED_VERSION.sh nogui
 
 # if [ "$FIRST_RUN" = "true" ]; then
-#     echo "INFO ! First bootstrap run (datapack generation)"
-#     "./run-${NEOFORGED_VERSION}.sh"
+#     echo "INFO ! First bootstrap run"
+#     ./run-${NEOFORGED_VERSION}.sh
+#     echo "INFO ! Bootstrap complete"
+#     touch "$BOOTSTRAP_MARKER"
 # else
-#     exec "./run-${NEOFORGED_VERSION}.sh" nogui
+#     exec ./run-${NEOFORGED_VERSION}.sh nogui
 # fi
 
 if [ "$FIRST_RUN" = "true" ]; then
-    echo "INFO ! First bootstrap run"
+    echo "INFO ! First bootstrap run (datapack generation)"
     "./run-${NEOFORGED_VERSION}.sh"
+    BOOTSTRAP_RC=$?
+
+    if [ $BOOTSTRAP_RC -ne 0 ]; then
+        echo "ERROR ! Bootstrap failed (exit code $BOOTSTRAP_RC)"
+        echo "ERROR ! World/datapacks are incomplete"
+        exit 1
+    fi
+
     echo "INFO ! Bootstrap complete"
     touch "$BOOTSTRAP_MARKER"
 else