diff --git a/core/AmRtpStream.cpp b/core/AmRtpStream.cpp
index e0251cac..57fb7e18 100644
--- a/core/AmRtpStream.cpp
+++ b/core/AmRtpStream.cpp
@@ -436,7 +436,7 @@ void AmRtpStream::setRAddr(const string& addr, unsigned short port)
    * We need to do more sophisticated parsing -- hence p_s_i_f_n().
    */
   if (!populate_sockaddr_in_from_name(addr, &sa)) {
-    ERROR("Address not valid (host: %s).\n", addr.c_str());
+    WARN("Address not valid (host: %s).\n", addr.c_str());
     throw string("invalid address");
   }
 
diff --git a/core/AmSession.cpp b/core/AmSession.cpp
index 4ef51f84..76a5bc7e 100644
--- a/core/AmSession.cpp
+++ b/core/AmSession.cpp
@@ -276,6 +276,9 @@ void AmSession::negotiate(const string& sdp_body,
     rtp_str.setLocalIP(AmConfig::LocalIP);
     rtp_str.setPassiveMode(passive_mode);
     rtp_str.setRAddr(r_host, r_port);
+  } catch (const string& err_str) {
+    unlockAudio();
+    throw AmSession::Exception(400, err_str);
   } catch (...) {
     unlockAudio();
     throw;