diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 7d6e7117..58a43b37 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -1056,7 +1056,9 @@ void entityclass::createblock( int t, int xp, int yp, int w, int h, int trig /*=
             if (custom)
             {
                 block.prompt = "Press %s to interact";
-            } else {
+            }
+            else
+            {
                 block.prompt = "Press %s to activate terminal";
             }
             block.script = "custom_"+customscript;
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index c688f436..4a2951ca 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -1909,8 +1909,11 @@ void scriptclass::run(void)
 			}
 			else if (words[0] == "setactivitytext")
 			{
-				position++;
-				obj.customactivitytext = commands[position];
+				++position;
+				if (INBOUNDS_VEC(position, commands))
+				{
+					obj.customactivitytext = commands[position];
+				}
 			}
 			else if (words[0] == "createrescuedcrew")
 			{