Merge branch 'hb/unmatched_returns/OTP-10908'

* hb/unmatched_returns/OTP-10908:
  Fix unmatched_returns warnings in Kernel
  Fix a minor bug in ets:tabfile_info() and ets:file2tab()
  Fix unmatched_returns warning in Kernel
  Fix unmatched_return warnings in sasl
  Fix unmatched_return warnings in kernel
  Fix unmatched_return warning in erl_prim_loader
  Fix unmatched_return warnings in stdlib
  Fix unmatched_returns warnings in STDLIB and Kernel

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 1e07620a3e..ecdb32424a 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -32,8 +32,13 @@ start(_, []) ->
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
 	    Type = get_error_logger_type(),
-	    error_logger:swap_handler(Type),
-	    {ok, Pid, []};
+            case error_logger:swap_handler(Type) of
+                ok -> {ok, Pid, []};
+                Error ->
+                    %% Not necessary since the node will crash anyway:
+                    exit(Pid, shutdown),
+                    Error
+            end;
 	Error -> Error
     end.