diff --git a/vulkan_logging.d b/vulkan_logging.d
index 26ee9f0..b2092f0 100644
--- a/vulkan_logging.d
+++ b/vulkan_logging.d
@@ -15,61 +15,68 @@ DebugCallback(
 {
 	string ms, mt;
 
-	const(char)[] msg = callback_data.pMessage[0 .. strlen(callback_data.pMessage)];
-	bool debug_printf = strcmp(callback_data.pMessageIdName, "WARNING-DEBUG-PRINTF") == 0;
-
-	switch (message_severity) {
-	case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
-		ms = "VERBOSE";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
-		ms = "INFO";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
-		ms = "WARNING";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
-		ms = "ERROR";
-		break;
-	default: 
-		ms = "UNKNOWN";
-		break;
-	}
-
-	switch (message_type) {
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
-		mt = "General";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT:
-		mt = "Validation";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
-		mt = "Validation | General";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
-		mt = "Performance";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
-		mt = "General | Performance";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
-		mt = "Validation | Performance";
-		break;
-	case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
-		mt = "General | Validation | Performance";
-		break;
-	default:
-		mt = "Unknown";
-		break;
-	}
-
-	if (debug_printf)
+	if (callback_data.pMessage != null)
 	{
-		writefln("SHADER PRINT: %s", msg);
-	}
-	else
-	{
-		writefln("[%s: %s]\n%r\n", ms, mt, msg);
+		const(char)[] msg = callback_data.pMessage[0 .. strlen(callback_data.pMessage)];
+		bool debug_printf = false;
+		if (callback_data.pMessageIdName != null)
+		{
+			debug_printf = (strcmp(callback_data.pMessageIdName, "WARNING-DEBUG-PRINTF") == 0);
+		}
+
+		switch (message_severity) {
+			case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
+				ms = "VERBOSE";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
+				ms = "INFO";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
+				ms = "WARNING";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
+				ms = "ERROR";
+				break;
+			default: 
+				ms = "UNKNOWN";
+				break;
+		}
+
+		switch (message_type) {
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
+				mt = "General";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT:
+				mt = "Validation";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
+				mt = "Validation | General";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
+				mt = "Performance";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
+				mt = "General | Performance";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT:
+				mt = "Validation | Performance";
+				break;
+			case VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT:
+				mt = "General | Validation | Performance";
+				break;
+			default:
+				mt = "Unknown";
+				break;
+		}
+
+		if (debug_printf)
+		{
+			writefln("SHADER PRINT: %s", msg);
+		}
+		else
+		{
+			writefln("[%s: %s]\n%r 12345", ms, mt, msg);
+		}
 	}
 
 	return VK_FALSE;