diff --git a/cpp/devices/scsi_printer.cpp b/cpp/devices/scsi_printer.cpp
index dcb9188b..1b903371 100644
--- a/cpp/devices/scsi_printer.cpp
+++ b/cpp/devices/scsi_printer.cpp
@@ -79,7 +79,9 @@ void SCSIPrinter::CleanUp()
 
 	if (out.is_open()) {
 		out.close();
+	}
 
+	if (!filename.empty()) {
 		error_code error;
 		remove(path(filename), error);
 
@@ -136,6 +138,8 @@ void SCSIPrinter::SynchronizeBuffer()
 		throw scsi_exception(sense_key::aborted_command);
 	}
 
+	out.close();
+
 	string cmd = GetParam("cmd");
 	const size_t file_position = cmd.find("%f");
 	assert(file_position != string::npos);