diff --git a/code/rd-rend2/G2_API.cpp b/code/rd-rend2/G2_API.cpp
index babe6f0534..5a290a7423 100644
--- a/code/rd-rend2/G2_API.cpp
+++ b/code/rd-rend2/G2_API.cpp
@@ -2201,23 +2201,12 @@ qboolean G2API_SetNewOrigin(CGhoul2Info* ghlInfo, const int boltIndex)
 {
 	if (G2_SetupModelPointers(ghlInfo))
 	{
-		if (boltIndex < 0)
+		// check for valid boltIndex before applying new origin
+		if (boltIndex >= 0 && boltIndex < (int)ghlInfo->mBltlist.size())
 		{
-            char modelName[MAX_QPATH];
-			if (ghlInfo->currentModel && ghlInfo->currentModel->name[0])
-			{
-				strcpy(modelName, ghlInfo->currentModel->name);
-			}
-			else
-			{
-				strcpy(modelName, "[Unknown - unexpected]");
-			}
-
-			Com_Error(ERR_DROP, "Bad boltindex (%i) trying to SetNewOrigin (naughty naughty!)\nModel %s\n", boltIndex, modelName);
+			ghlInfo->mNewOrigin = boltIndex;
+			ghlInfo->mFlags |= GHOUL2_NEWORIGIN;
 		}
-
-		ghlInfo->mNewOrigin = boltIndex;
-		ghlInfo->mFlags |= GHOUL2_NEWORIGIN;
 		return qtrue;
 	}
 	return qfalse;