1 files changed, 6 insertions, 10 deletions
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 96f9f91808..cfc2a19ccd 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -658,16 +658,12 @@ expr({map,Line,Fs0}, Bs0, Ieval) ->
 expr({map,Line,E0,Fs0}, Bs0, Ieval0) ->
     Ieval = Ieval0#ieval{line=Line,top=false},
     {value,E,Bs1} = expr(E0, Bs0, Ieval),
-    case E of
-        #{} ->
-            {Fs,Bs2} = eval_map_fields(Fs0, Bs0, Ieval),
-            Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
-                                    ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi)
-                                end, E, Fs),
-            {value,Value,merge_bindings(Bs2, Bs1, Ieval)};
-        _ ->
-            exception(error, {badarg,E}, Bs1, Ieval)
-    end;
+    {Fs,Bs2} = eval_map_fields(Fs0, Bs0, Ieval),
+    _ = maps:put(k, v, E),			%Validate map.
+    Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
+			    ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi)
+			end, E, Fs),
+    {value,Value,merge_bindings(Bs2, Bs1, Ieval)};
 %% A block of statements
 expr({block,Line,Es},Bs,Ieval) ->
     seq(Es, Bs, Ieval#ieval{line=Line});