Index: src/game/g_buildable.c
===================================================================
--- src/game/g_buildable.c	(revision 824)
+++ src/game/g_buildable.c	(working copy)
@@ -2180,7 +2194,8 @@
 
   self->die = nullDieFunction;
   self->powered = qfalse; //free up power
-  self->s.eFlags &= ~EF_FIRING; //prevent any firing effects
+  //prevent any firing effects and cancel structure protection
+  self->s.eFlags &= ~( EF_FIRING | EF_DBUILDER );
 
   if( self->spawned )
   {
Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 824)
+++ src/game/g_cmds.c	(working copy)
@@ -1855,7 +1855,7 @@
 
       // Don't allow destruction of buildables that cannot be rebuilt
       if( g_suddenDeathTime.integer && ( level.time - level.startTime >=
-          g_suddenDeathTime.integer * 60000 ) &&
+          g_suddenDeathTime.integer * 60000 ) && ( traceEnt->health > 0 ) &&
           BG_FindBuildPointsForBuildable( traceEnt->s.modelindex ) )
       {
         return;