2 files changed, 17 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index fe1212b7e0..88aabc1e4a 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -63,9 +63,9 @@ encode(Mod, #diameter_packet{} = Pkt) ->
         e(Mod, Pkt)
     catch
         error: Reason ->
-            %% Be verbose rather than letting the emulator truncate the
-            %% error report.
-            X = {Reason, ?STACK},
+            %% Be verbose since a crash report may be truncated and
+            %% encode errors are self-inflicted.
+            X = {?MODULE, encode, {Reason, ?STACK}},
             diameter_lib:error_report(X, {?MODULE, encode, [Mod, Pkt]}),
             exit(X)
     end;
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 99644814d2..588ebfb4e8 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -202,14 +202,27 @@ handle_info(T, #state{} = State) ->
             ?LOG(stop, T),
             x(T, State)
     catch
+        exit: {diameter_codec, encode, _} = Reason ->
+            close_wd(Reason, State#state.parent),
+            ?LOG(stop, Reason),
+            %% diameter_codec:encode/2 emits an error report. Only
+            %% indicate the probable reason here.
+            diameter_lib:info_report(probable_configuration_error,
+                                     insufficient_capabilities),
+            {stop, {shutdown, Reason}, State};
         {?MODULE, Tag, Reason}  ->
             ?LOG(Tag, {Reason, T}),
             {stop, {shutdown, Reason}, State}
     end.
-%% The form of the exception caught here is historical. It's
+%% The form of the throw caught here is historical. It's
 %% significant that it's not a 2-tuple, as in ?FAILURE(Reason),
 %% since these are caught elsewhere.
 
+%% Note that there's no guarantee that the service and transport
+%% capabilities are good enough to build a CER/CEA that can be
+%% succesfully encoded. It's not checked at diameter:add_transport/2
+%% since this can be called before creating the service.
+
 x(Reason, #state{} = S) ->
     close_wd(Reason, S),
     {stop, {shutdown, Reason}, S}.