diff --git a/src/extended/aws-smtp-server.adb b/src/extended/aws-smtp-server.adb
index 09af751ac..b93b3b3d0 100644
--- a/src/extended/aws-smtp-server.adb
+++ b/src/extended/aws-smtp-server.adb
@@ -220,7 +220,13 @@ package body AWS.SMTP.Server is
       Messages.Set.Set_Body (Message, To_String (Message_Body));
       Messages.Set.Headers (Message, Headers);
 
+      Net.Free (S);
       return Message;
+
+   exception
+      when others =>
+         Net.Free (S);
+         raise;
    end Get_Message;
 
    --------------