diff --git a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java
index 11cf843..9b4cf9d 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java
@@ -70,7 +70,14 @@ public class HL7Receiver<T extends AbstractMessage> implements ReceivingApplicat
 
     private Message generateACKWithAR(Message message, String s) throws HL7Exception {
         try {
-            return message.generateACK(AcknowledgmentCode.AR, new HL7Exception(s, ErrorCode.UNKNOWN_KEY_IDENTIFIER));
+            Message returnMessage = message.generateACK(AcknowledgmentCode.AR, new HL7Exception(s, ErrorCode.UNKNOWN_KEY_IDENTIFIER));
+            HL7LogEntry entry = new HL7LogEntry();
+            entry.setMessage(returnMessage.encode());
+            entry.setSource("127.0.0.1:1234"); // TODO: Naja...
+            entry.setTimestamp(LocalDateTime.now());
+            entry.setDirection(HL7LogEntry.Direction.OUT);
+            HL7Utils.logHL7MessageToDatabase(entry);
+            return returnMessage;
         } catch (IOException e) {
             throw new HL7Exception(e);
         }
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
index 9fdaa5d..c7f06be 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
@@ -23,7 +23,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
+ * Manages all HL7 sending tasks. This includes: creating a message, sending the message,
  * Created by taschi on 22.11.15.
+ *
  */
 public class HL7Sender {
 
@@ -32,7 +34,7 @@ public class HL7Sender {
      *
      *
      * @param fall to create the message from this content. patient and diagnosis are linked to fall
-     * @throws Exception
+     * @throws HL7Exception, IOException, SQLException
      */
     public static void createMessageADT_A01(Fall fall) throws HL7Exception, IOException, SQLException {
         Patient patient = fall.getPatient();
@@ -93,7 +95,7 @@ public class HL7Sender {
 
     /**
      * Sending message handler. Calls function to send current message
-     * @param message
+     * @param message to send
      * @throws HL7Exception
      */
     private static void sendMessage(Message message) throws HL7Exception {
@@ -126,7 +128,7 @@ public class HL7Sender {
         HL7LogEntry responseEntry = new HL7LogEntry();
 
         messageEntry.setMessage(message.encode());
-        messageEntry.setSource("127.0.0.1:1234"); // TODO: Kann man den lokal genutzen Port raus finden?
+        messageEntry.setSource("127.0.0.1:1234");
         messageEntry.setDirection(HL7LogEntry.Direction.OUT);
         messageEntry.setTimestamp(LocalDateTime.now());
         messageEntry.setTimestamp(HL7Utils.parseLocalDateTime(adt_a01.getMSH().getDateTimeOfMessage().getTime()));