diff --git a/slsReceiverSoftware/src/BinaryDataFile.cpp b/slsReceiverSoftware/src/BinaryDataFile.cpp
index 42f7c3744..d170532ab 100644
--- a/slsReceiverSoftware/src/BinaryDataFile.cpp
+++ b/slsReceiverSoftware/src/BinaryDataFile.cpp
@@ -103,13 +103,10 @@ void BinaryDataFile::WriteToFile(char *imageData, sls_receiver_header &header,
     }
 
     // if write error
-    if (ret != imageSize + sizeof(sls_receiver_header)) {
-        throw RuntimeError(
-            std::to_string(index) +
-            " : Write to file failed for image number " +
-            std::to_string(currentFrameNumber) + ". Wrote " +
-            std::to_string(ret) + " bytes instead of " +
-            std::to_string(imageSize + sizeof(sls_receiver_header)));
+    if (ret != 1) {
+        throw RuntimeError(std::to_string(index) +
+                           " : Write to file failed for image number " +
+                           std::to_string(currentFrameNumber));
     }
 }
 
diff --git a/slsReceiverSoftware/src/MasterFileUtility.cpp b/slsReceiverSoftware/src/MasterFileUtility.cpp
index 81ad932ff..10d50fb9c 100644
--- a/slsReceiverSoftware/src/MasterFileUtility.cpp
+++ b/slsReceiverSoftware/src/MasterFileUtility.cpp
@@ -32,8 +32,7 @@ std::string CreateMasterBinaryFile(const std::string &filePath,
     rapidjson::StringBuffer s;
     rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(s);
     attr->GetBinaryAttributes(&writer);
-    if (fwrite(s.GetString(), 1, strlen(s.GetString()), fd) !=
-        strlen(s.GetString())) {
+    if (fwrite(s.GetString(), strlen(s.GetString()), 1, fd) != 1) {
         throw RuntimeError(
             "Master binary file incorrect number of bytes written to file");
     }