diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index 63a5bec80a..525f04680d 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -2709,7 +2709,7 @@ void ActionAfterCallback::run(MipsCall &call) {
 // Returns true if any callbacks were processed on the current thread.
 bool __KernelCheckThreadCallbacks(Thread *thread, bool force)
 {
-	if (!thread->isProcessingCallbacks && !force)
+	if (!thread || (!thread->isProcessingCallbacks && !force))
 		return false;
 
 	for (int i = 0; i < THREAD_CALLBACK_NUM_TYPES; i++) {
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
index 815e6b6009..218e230244 100644
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -1403,7 +1403,7 @@ int sceMp3Decode(u32 mp3, u32 outPcmPtr)
 	// TODO: Actually decode the data
 #ifdef _DEBUG
 	char fileName[256];
-	sprintf(fileName, "%i.mp3", ctx->mp3StreamPosition);
+	sprintf(fileName, "%lli.mp3", ctx->mp3StreamPosition);
 
 	FILE * file = fopen(fileName, "wb");
 	if(file) {
diff --git a/native b/native
index 1ec67d5ac2..22136ff257 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 1ec67d5ac2e52d2a1bc02b92645fefa78fca1e8b
+Subproject commit 22136ff2579ba7046b6f8271a4b45643b90e621d