diff --git a/source/simulation2/components/CCmpTemplateManager.cpp b/source/simulation2/components/CCmpTemplateManager.cpp
index 12b614626c..dfce31dbeb 100644
--- a/source/simulation2/components/CCmpTemplateManager.cpp
+++ b/source/simulation2/components/CCmpTemplateManager.cpp
@@ -213,7 +213,7 @@ bool CCmpTemplateManager::LoadTemplateFile(const std::wstring& templateName, int
 		if (!LoadTemplateFile(baseName, depth+1))
 		{
 			LOGERROR(L"Failed to load entity template '%ls'", baseName.c_str());
-			return NULL;
+			return false;
 		}
 		// Copy a subset to the requested template
 		CopyPreviewSubset(m_TemplateFileData[templateName], m_TemplateFileData[baseName]);
@@ -228,7 +228,7 @@ bool CCmpTemplateManager::LoadTemplateFile(const std::wstring& templateName, int
 		if (!LoadTemplateFile(baseName, depth+1))
 		{
 			LOGERROR(L"Failed to load entity template '%ls'", baseName.c_str());
-			return NULL;
+			return false;
 		}
 		// Copy a subset to the requested template
 		CopyFoundationSubset(m_TemplateFileData[templateName], m_TemplateFileData[baseName]);
diff --git a/source/simulation2/system/Message.h b/source/simulation2/system/Message.h
index e9cfd8be22..88dbc21fb7 100644
--- a/source/simulation2/system/Message.h
+++ b/source/simulation2/system/Message.h
@@ -26,6 +26,7 @@ class CMessage
 protected:
 	CMessage() { }
 public:
+	virtual ~CMessage() { }
 	virtual EMessageTypeId GetType() const = 0;
 	virtual const char* GetScriptHandlerName() const = 0;
 	virtual const char* GetScriptGlobalHandlerName() const = 0;