merge stable into default

1 files changed, 7 insertions, 4 deletions

diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl
index e96792762c..db674f91d8 100644
--- a/src/rabbit_vm.erl
+++ b/src/rabbit_vm.erl
@@ -127,10 +127,13 @@ plugin_memory() ->
                   is_plugin(atom_to_list(App))]).
 
 plugin_memory(App) ->
-    case catch application_master:get_child(
-                 application_controller:get_master(App)) of
-        {Pid, _} -> sup_memory(Pid);
-        _        -> 0
+    case application_controller:get_master(App) of
+        undefined -> 0;
+        Master    -> case application_master:get_child(Master) of
+                         {Pid, _} when is_pid(Pid) -> sup_memory(Pid);
+                         Pid      when is_pid(Pid) -> sup_memory(Pid);
+                         _                         -> 0
+                     end
     end.
 
 is_plugin("rabbitmq_" ++ _) -> true;