diff --git a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
index 4e36c99f7365652cd81c6ccfd47c0168660efe22..05d927c7607528ee80b0bb155ad16f5708e4894f 100644
--- a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
+++ b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/message/AbstractMessage.java
@@ -105,7 +105,11 @@ public abstract class AbstractMessage {
 	}
 
 	public int getMessageLength() {
-		return messageReceived.length;
+		if (messageReceived == null) {
+			return 0;
+		} else {
+			return messageReceived.length;
+		}
 	}
 
 	public void setMessageReceivedAsString(String messageReceived) {
diff --git a/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml b/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
index a1f4d9e0be78f9405824068f9261d70ed97f39e6..88b4d61b0cd32b8a7e8b10d68e0ef23f8eae3055 100644
--- a/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
+++ b/gazelle-proxy-war/src/main/webapp/messages/dicom.xhtml
@@ -19,7 +19,7 @@
 				<h:outputText value="#{messageBean.message.fileTransfertSyntax}" />
 
 				<h:outputText value="Attributes :" style="font-weight:bold;" />
-				<h:outputText
+				<h:outputText style="font-family: monospace;" escape="false"
 					value="#{messageBean.escape(messageBean.message.getAttributesForCommandSetAsString())}" />
 
 				<h:outputText value="Affected SOP Class :" style="font-weight:bold;" />
diff --git a/pom.xml b/pom.xml
index 4331525c9233b69861dca17f9345e93502934c94..8f90728969ea095be6ef6039b8f132db42664066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
 			<dependency>
 				<groupId>net.ihe.gazelle.simulators.tls</groupId>
 				<artifactId>TLSSimulator-pki-jar</artifactId>
-				<version>1.2-SNAPSHOT</version>
+				<version>1.2</version>
 				<type>jar</type>
 			</dependency>