diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp
index 43925dbb0c5..27c1e26fa78 100644
--- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp
+++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp
@@ -199,11 +199,17 @@ nsViewerApp::Initialize(int argc, char** argv)
   rv = nsServiceManager::GetService(kEventQueueServiceCID,
                                     kIEventQueueServiceIID,
                                     (nsISupports **)&mEventQService);
-  if (NS_OK == rv) {
-    // XXX: What if this fails?
-    rv = mEventQService->CreateThreadEventQueue();
+  if (NS_OK != rv) {
+     NS_ASSERTION("Could not obtain the event queue service", PR_FALSE);
+     return rv;
   }
 
+  printf("Going to create the event queue\n");
+  rv = mEventQService->CreateThreadEventQueue();
+  if (NS_OK != rv) {
+     NS_ASSERTION("Could not create the event queue for the the thread", PR_FALSE);
+     return rv;
+  }
 
   // Create widget application shell
   rv = nsRepository::CreateInstance(kAppShellCID, nsnull, kIAppShellIID,