diff --git a/src/projectM-wmp/projectM-wmp/projectM-wmp.cpp b/src/projectM-wmp/projectM-wmp/projectM-wmp.cpp
index b146cf272..60275c17f 100644
--- a/src/projectM-wmp/projectM-wmp/projectM-wmp.cpp
+++ b/src/projectM-wmp/projectM-wmp/projectM-wmp.cpp
@@ -340,10 +340,13 @@ STDMETHODIMP CProjectMwmp::Create(HWND hwndParent)
 //////////////////////////////////////////////////////////////////////////////
 STDMETHODIMP CProjectMwmp::Destroy()
 {
-    m_hwndParent = NULL;
-	starting = true;
-	delete(globalPM);
-    return S_OK;
+	if (!starting)
+	{
+	    m_hwndParent = NULL;
+		starting = true;
+		delete(globalPM);
+		return S_OK;
+	}
 }
 
 
@@ -379,7 +382,7 @@ char* ConvertBSTRToLPSTR (BSTR bstrIn)
 //////////////////////////////////////////////////////////////////////////////
 STDMETHODIMP CProjectMwmp::NotifyNewMedia(IWMPMedia *pMedia)
 {
-	if (starting == false)
+	if (starting == false && pMedia != NULL)
 	{
 	CComBSTR name;
 	pMedia->get_name(&name);