diff --git a/src/nsterm.m b/src/nsterm.m
index d5de47b355ee..71f775465d7c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1160,6 +1160,7 @@ Free a pool and temporary objects it refers to (callable from C)
     }
 
   xfree (f->output_data.ns);
+  f->output_data.ns = 0;
 
   [[view window] close];
   [view release];
@@ -6411,6 +6412,10 @@ - (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)propose
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification {
+
+
+  if (!emacsframe || !emacsframe->output_data.ns || ns_in_resize || ! FRAME_LIVE_P (emacsframe))
+    return;
  
    NSWindow* window = [notification object];