Make some division checks safer

diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h
index df23cc0b376b1cfa399ae447711322058baeb698..cfd6a94af689ffd6570e0477b9965c9e737bde0e 100644 (file)
--- a/hdrs/dbdefs.h
+++ b/hdrs/dbdefs.h
@@ -66,7 +66,7 @@ extern dbref first_free;      /* pointer to free list */
 #define IsRoom(x)       (!!(Typeof(x) & TYPE_ROOM))
 #define IsThing(x)      (!!(Typeof(x) & TYPE_THING))
 #define IsExit(x)       (!!(Typeof(x) & TYPE_EXIT))
-#define IsDivision(x)  (!!(Typeof(x) & TYPE_DIVISION))
+#define IsDivision(x)  (GoodObject(x) && !!(Typeof(x) & TYPE_DIVISION))
 #define IsMasterDivision(x) (GoodObject(x) && IsDivision(x) && Division(x) == NOTHING)
 
 /* Was Destroyed() */