diff --git a/src/apps/diskprobe/AttributeWindow.cpp b/src/apps/diskprobe/AttributeWindow.cpp
index 41bac7022a..f8f803163a 100644
--- a/src/apps/diskprobe/AttributeWindow.cpp
+++ b/src/apps/diskprobe/AttributeWindow.cpp
@@ -261,7 +261,8 @@ AttributeWindow::MessageReceived(BMessage *message)
 bool 
 AttributeWindow::QuitRequested()
 {
-	fTypeEditorView->CommitChanges();
+	if (fTypeEditorView != NULL)
+		fTypeEditorView->CommitChanges();
 
 	bool quit = fProbeView->QuitRequested();
 	if (!quit)