From 7c2a088b34cf9acff43586d1c6d303f57bb82927 Mon Sep 17 00:00:00 2001
From: Aussiemon <mattrohrlach+github@gmail.com>
Date: Wed, 14 Dec 2016 20:13:23 -0700
Subject: [PATCH] Added check before removing water collision object from world

---
 apps/openmw/mwphysics/physicssystem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1a97fc6ffd..1985dba188 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1463,7 +1463,10 @@ namespace MWPhysics
     {
         if (mWaterCollisionObject.get())
         {
-            mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get());
+            if (mWaterCollisionObject.get()->getWorldArrayIndex() >= 0)
+            {
+                mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get());
+            }
         }
 
         if (!mWaterEnabled)