diff --git a/base/dictionary.h b/base/dictionary.h
index ec8df2451..9891335e5 100644
--- a/base/dictionary.h
+++ b/base/dictionary.h
@@ -53,7 +53,7 @@ public:
 		if (i == m_Data.end())
 			return false;
 
-		*value = i->second;
+		*value = static_cast<T>(i->second);
 
 		return true;
 	}
diff --git a/base/exception.h b/base/exception.h
index 9687b7341..b3638a15b 100644
--- a/base/exception.h
+++ b/base/exception.h
@@ -41,7 +41,7 @@ public:
 	/**
 	 * Destructor for the Exception class. Must be virtual for RTTI to work.
 	 */
-	virtual ~Exception(void)
+	virtual ~Exception(void) throw()
 	{
 		delete m_Message;
 	}