diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl
index 9e16a56c5..65c37a7ab 100644
--- a/src/mod_muc_mnesia.erl
+++ b/src/mod_muc_mnesia.erl
@@ -76,9 +76,11 @@ store_room(_LServer, Host, Name, Opts, _) ->
     mnesia:transaction(F).
 
 restore_room(_LServer, Host, Name) ->
-    case catch mnesia:dirty_read(muc_room, {Name, Host}) of
+    try mnesia:dirty_read(muc_room, {Name, Host}) of
 	[#muc_room{opts = Opts}] -> Opts;
 	_ -> error
+    catch
+	_:_ -> {error, db_failure}
     end.
 
 forget_room(_LServer, Host, Name) ->
diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
index f99325f87..31c8703c1 100644
--- a/src/mod_muc_sql.erl
+++ b/src/mod_muc_sql.erl
@@ -220,7 +220,7 @@ restore_room(LServer, Host, Name) ->
 		    Opts2 = lists:keystore(subscribers, 1, OptsD, {subscribers, SubData}),
 		    mod_muc:opts_to_binary(Opts2);
 		_ ->
-        	    {error, db_failure}
+		    {error, db_failure}
 	    end;
 	{selected, _} ->
             error;