3 files changed, 18 insertions, 11 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 00701f5a2d..0a77527b2f 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -861,6 +861,8 @@ get_status() ->
 	    
 get_testdata(Key) ->
     case catch ct_util:get_testdata(Key) of
+	{error,ct_util_server_not_running} ->
+	    no_tests_running;
 	Error = {error,_Reason} ->
 	    Error;
 	{'EXIT',_Reason} ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 3b6ad6f98d..e9bfb2590b 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -827,15 +827,20 @@ get_profile_data(Profile, Key, StartDir) ->
 %%%-----------------------------------------------------------------
 %%% Internal functions
 call(Msg) ->
-    MRef = erlang:monitor(process,whereis(ct_util_server)),
-    Ref = make_ref(),
-    ct_util_server ! {Msg,{self(),Ref}},
-    receive
-	{Ref, Result} -> 
-	    erlang:demonitor(MRef, [flush]),
-	    Result;
-	{'DOWN',MRef,process,_,Reason}  -> 
-	    {error,{ct_util_server_down,Reason}}
+    case whereis(ct_util_server) of
+	undefined ->
+	    {error,ct_util_server_not_running};
+	Pid ->
+	    MRef = erlang:monitor(process, Pid),
+	    Ref = make_ref(),
+	    ct_util_server ! {Msg,{self(),Ref}},
+	    receive
+		{Ref, Result} -> 
+		    erlang:demonitor(MRef, [flush]),
+		    Result;
+		{'DOWN',MRef,process,_,Reason}  -> 
+		    {error,{ct_util_server_down,Reason}}
+	    end
     end.
 
 return({To,Ref},Result) ->
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index bd218dc05f..053edba846 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -946,10 +946,10 @@ test_events(misc_errors) ->
 		   {failed,{error,{suite_failed,this_is_expected}}}}},
      {?eh,test_stats,{0,5,{0,0}}},
      {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_1}},
-     {?eh,tc_done,{undefined,undefined,i_die_now}},
+     {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_1,i_die_now}},
      {?eh,test_stats,{0,6,{0,0}}},
      {?eh,tc_start,{misc_error_1_SUITE,killed_by_signal_2}},
-     {?eh,tc_done,{undefined,undefined,
+     {?eh,tc_done,{misc_error_1_SUITE,killed_by_signal_2,
 		   {failed,testcase_aborted_or_killed}}},
      {?eh,test_stats,{0,7,{0,0}}},
      {?eh,test_done,{'DEF','STOP_TIME'}},