diff --git a/tools/xml2cpp-codegen/BaseGenerator.cpp b/tools/xml2cpp-codegen/BaseGenerator.cpp
index b3265605..d9dde3fd 100644
--- a/tools/xml2cpp-codegen/BaseGenerator.cpp
+++ b/tools/xml2cpp-codegen/BaseGenerator.cpp
@@ -53,7 +53,7 @@ int BaseGenerator::transformXmlToFile(const Document& doc, const char* filename)
 int BaseGenerator::writeToFile(const char* filename, const std::string& data) const
 {
     std::ofstream file(filename);
-    if (file.bad())
+    if (file.fail())
     {
         std::cerr << "Unable to write file " << filename << endl;
         return 1;
diff --git a/tools/xml2cpp-codegen/xml2cpp.cpp b/tools/xml2cpp-codegen/xml2cpp.cpp
index 247bdee4..5a8bdfc6 100644
--- a/tools/xml2cpp-codegen/xml2cpp.cpp
+++ b/tools/xml2cpp-codegen/xml2cpp.cpp
@@ -186,7 +186,10 @@ int main(int argc, char **argv)
             std::cerr << "Generating proxy header " << proxy << endl;
         }
         ProxyGenerator pg;
-        pg.transformXmlToFile(doc, proxy);
+        if(pg.transformXmlToFile(doc, proxy)) {
+            std::cerr << "Failed to generate proxy header" << endl;
+            return 1;
+        }
     }
 
     if (adaptor)
@@ -196,7 +199,11 @@ int main(int argc, char **argv)
             std::cerr << "Generating adaptor header " << adaptor << endl;
         }
         AdaptorGenerator ag;
-        ag.transformXmlToFile(doc, adaptor);
+        if(ag.transformXmlToFile(doc, adaptor)) {
+            std::cerr << "Failed to generate adaptor header" << endl;
+            return 1;
+        }
+
     }
 
     return 0;