diff --git a/Frameworks/document/src/OakDocumentEditor.mm b/Frameworks/document/src/OakDocumentEditor.mm
index a606a88e..9e2c35f4 100644
--- a/Frameworks/document/src/OakDocumentEditor.mm
+++ b/Frameworks/document/src/OakDocumentEditor.mm
@@ -94,7 +94,8 @@ static int32_t const NSWrapColumnWindowWidth = 0;
 		[_document endUndoGrouping];
 
 	[self documentWillSave:_document];
-	self.buffer.remove_callback(_buffer_callback.get());
+	if(_document && _buffer_callback)
+		self.buffer.remove_callback(_buffer_callback.get());
 	_layout.reset();
 	_editor.reset();
 	[_document close];