diff --git a/Buffer.cc b/Buffer.cc
index 9cdde2e..b74d557 100644
--- a/Buffer.cc
+++ b/Buffer.cc
@@ -276,7 +276,7 @@ Buffer::MarkDirty()
 bool
 Buffer::IsDirty()
 {
-	return this->dirty;
+	return this->status == FileStatus::FileStatusOK && this->dirty;
 }
 
 
@@ -360,4 +360,3 @@ Buffer::clearContents()
 	this->contents.clear();
 }
 
-
diff --git a/Frame.cc b/Frame.cc
index 0adb7f4..2a1c9b7 100644
--- a/Frame.cc
+++ b/Frame.cc
@@ -60,5 +60,5 @@ Frame::Refresh()
 Buffer::FileStatus
 Frame::Flush()
 {
-	return this->bmap[this->activeBuffer]->Flush();
+	return this->bmap[this->activeBuffer]->Flush(nullptr);
 }