diff --git a/Themes/_fallback/Scripts/02 Actor.lua b/Themes/_fallback/Scripts/02 Actor.lua
index 7144c89b0b..84a570c76f 100644
--- a/Themes/_fallback/Scripts/02 Actor.lua	
+++ b/Themes/_fallback/Scripts/02 Actor.lua	
@@ -141,7 +141,7 @@ function Actor:bezier(...)
    for i=3,c do
       b[#b+1] = a[i]
    end
-   a[1]:tween(a[2], "TweenMode_Bezier", b)
+   self:tween(a[2], "TweenMode_Bezier", b)
 end	 
 
 -- (c) 2006 Glenn Maynard
diff --git a/src/ScreenOptionsEditCourse.cpp b/src/ScreenOptionsEditCourse.cpp
index 5f05f33830..82ee683d89 100644
--- a/src/ScreenOptionsEditCourse.cpp
+++ b/src/ScreenOptionsEditCourse.cpp
@@ -394,7 +394,10 @@ void ScreenOptionsEditCourse::SetCurrentSong()
 			if( index != 0 )
 				pSong = m_vpSongs[ index - 1 ];
 		}
-		GAMESTATE->m_pCurSong.Set( pSong );
+		if ( pSong != NULL )
+		{
+			GAMESTATE->m_pCurSong.Set( pSong );
+		}
 	}
 }
 
diff --git a/src/arch/ArchHooks/ArchHooks_Win32.cpp b/src/arch/ArchHooks/ArchHooks_Win32.cpp
index a036ef764d..05d67feacf 100644
--- a/src/arch/ArchHooks/ArchHooks_Win32.cpp
+++ b/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -19,7 +19,7 @@ static bool g_bIsMultipleInstance = false;
 void InvalidParameterHandler( const wchar_t *szExpression, const wchar_t *szFunction, const wchar_t *szFile,
 					  unsigned int iLine, uintptr_t pReserved )
 {
-	FAIL_M( "Invalid parameter" );
+  FAIL_M( "Invalid parameter" ); //TODO: Make this more informative
 }
 #endif