diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
index 4747834738279838373248fd141c762bbfbafd5b..387f227f3f891906bc22f1218acb5ca6ed9f00f0 100644
--- a/daemon/src/audio/audiortp/audio_rtp_factory.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
@@ -28,8 +28,6 @@
  *  as that of the covered work.
  */
 
-
-
 #include "audio_rtp_factory.h"
 #include "audio_zrtp_session.h"
 #include "audio_srtp_session.h"
@@ -112,13 +110,13 @@ void AudioRtpFactory::initSession()
 void AudioRtpFactory::start(AudioCodec* audiocodec)
 {
     if (rtpSession_ == NULL)
-        throw AudioRtpFactoryException("AudioRtpFactory: Error: RTP session was null when trying to start audio thread");
+        throw AudioRtpFactoryException("RTP session was null when trying to start audio thread");
 
     if (keyExchangeProtocol_ == SDES and cachedLocalContext_ and cachedRemoteContext_)
         static_cast<AudioSrtpSession *>(rtpSession_)->restoreCryptoContext(cachedLocalContext_, cachedRemoteContext_);
 
     if (rtpSession_->startRtpThread(*audiocodec) != 0)
-        throw AudioRtpFactoryException("AudioRtpFactory: Error: Failed to start AudioRtpSession thread");
+        throw AudioRtpFactoryException("Failed to start AudioRtpSession thread");
 }
 
 void AudioRtpFactory::stop()
@@ -132,7 +130,7 @@ void AudioRtpFactory::stop()
 int AudioRtpFactory::getSessionMedia()
 {
     if (rtpSession_ == NULL)
-        throw AudioRtpFactoryException("AudioRtpFactory: Error: RTP session was null when trying to get session media type");
+        throw AudioRtpFactoryException("RTP session was null when trying to get session media type");
 
     return rtpSession_->getCodecPayloadType();
 }
@@ -140,7 +138,7 @@ int AudioRtpFactory::getSessionMedia()
 void AudioRtpFactory::updateSessionMedia(AudioCodec *audiocodec)
 {
     if (rtpSession_ == NULL)
-        throw AudioRtpFactoryException("AudioRtpFactory: Error: rtpSession_ was null when trying to update IP address");
+        throw AudioRtpFactoryException("rtpSession_ was NULL when trying to update IP address");
 
     rtpSession_->updateSessionMedia(*audiocodec);
 }
@@ -156,7 +154,7 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
     if (keyExchangeProtocol_ == ZRTP)
         return static_cast<AudioZrtpSession *>(rtpSession_);
     else
-        throw AudioRtpFactoryException("RTP: Error: rtpSession_ is NULL in getAudioZrtpSession");
+        throw AudioRtpFactoryException("rtpSession_ is NULL in getAudioZrtpSession");
 }
 
 void sfl::AudioRtpFactory::initLocalCryptoInfo()