diff --git a/src/kernel/build.c b/src/kernel/build.c
index 86b390755..79b7d7567 100644
--- a/src/kernel/build.c
+++ b/src/kernel/build.c
@@ -774,7 +774,8 @@ build_building(unit * u, const building_type * btype, int want, order * ord)
     fset(b, BLD_MAINTAINED);
 
     /* Die Einheit befindet sich automatisch im Inneren der neuen Burg. */
-    if (leave(u, false)) {
+    /* Check if unit still have member, as stonegolems are destroyed during construction*/
+    if (leave(u, false) && u->number >> 0) {     
       u_set_building(u, b);
       assert(building_owner(b)==u);
     }