1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index d5b62bd3a7..2cbbee83bd 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -331,7 +331,14 @@ void callMouseExit()
 
 void callWindowFocus()
 {
-	gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation);
+    if ( gWindowImplementation && gWindowImplementation->getCallbacks() )
+    {
+        gWindowImplementation->getCallbacks()->handleFocus (gWindowImplementation);
+    }
+    else
+    {
+        LL_WARNS("COCOA") << "Window Implementation or callbacks not yet initialized." << LL_ENDL;
+    }
 }
 
 void callWindowUnfocus()