Don't crash when an alarm is cleared when there's nothing to clear

1 files changed, 6 insertions, 1 deletions

diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 17f1edcf93..0724757302 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -145,7 +145,12 @@ dict_unappend_all(Key, _Val, Dict) ->
     dict:erase(Key, Dict).
 
 dict_unappend(Key, Val, Dict) ->
-    case lists:delete(Val, dict:fetch(Key, Dict)) of
+    L = case dict:find(Key, Dict) of
+	    {ok, V} -> V;
+	    error   -> []
+	end,
+
+    case lists:delete(Val, L) of
         [] -> dict:erase(Key, Dict);
         X  -> dict:store(Key, X, Dict)
     end.