diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp
index 37ddf2b46b..0858ea89f9 100644
--- a/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp
+++ b/extras/Introjucer/Source/ComponentEditor/jucer_BinaryResources.cpp
@@ -80,7 +80,7 @@ BinaryResources::BinaryResource* BinaryResources::findResource (const String& na
         if (resources.getUnchecked(i)->name == name)
             return resources.getUnchecked(i);
 
-    return 0;
+    return nullptr;
 }
 
 const BinaryResources::BinaryResource* BinaryResources::getResource (const String& name) const
@@ -94,7 +94,7 @@ const BinaryResources::BinaryResource* BinaryResources::getResourceForFile (cons
         if (resources.getUnchecked(i)->originalFilename == file.getFullPathName())
             return resources.getUnchecked(i);
 
-    return 0;
+    return nullptr;
 }
 
 bool BinaryResources::add (const String& name, const File& file)
diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp
index b2da3ddfc1..23a5c28e7d 100644
--- a/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp
+++ b/extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp
@@ -591,11 +591,10 @@ bool JucerDocument::reloadFromDocument()
 
     currentXML = newXML;
     stopTimer();
-    if (! loadFromXml (*currentXML))
-        return false;
 
     resources.loadFromCpp (getCppFile(), cppContent);
-    return true;
+
+    return loadFromXml (*currentXML);
 }
 
 XmlElement* JucerDocument::pullMetaDataFromCppFile (const String& cpp)