diff --git a/html/siptest.js b/html/siptest.js
index 074f66659d..e54feb46c3 100644
--- a/html/siptest.js
+++ b/html/siptest.js
@@ -156,6 +156,14 @@ $(document).ready(function() {
 											$('#password').removeAttr('disabled');
 											$('#register').removeAttr('disabled').click(registerUsername);
 											$('#registerset').removeAttr('disabled');
+										} else {
+											// Reset status
+											sipcall.hangup();
+											$('#dovideo').removeAttr('disabled').val('');
+											$('#peer').removeAttr('disabled').val('');
+											$('#call').removeAttr('disabled').html('Call')
+												.removeClass("btn-danger").addClass("btn-success")
+												.unbind('click').click(doCall);
 										}
 										bootbox.alert(error);
 										return;
diff --git a/plugins/janus_sip.c b/plugins/janus_sip.c
index 90677f4722..7fe5f0d9c8 100644
--- a/plugins/janus_sip.c
+++ b/plugins/janus_sip.c
@@ -1616,6 +1616,12 @@ static void *janus_sip_handler(void *data) {
 				g_snprintf(error_cause, 512, "Missing SDP");
 				goto error;
 			}
+			if(strstr(msg->sdp, "m=application")) {
+				JANUS_LOG(LOG_ERR, "The SIP plugin does not support DataChannels\n");
+				error_code = JANUS_SIP_ERROR_MISSING_SDP;
+				g_snprintf(error_cause, 512, "The SIP plugin does not support DataChannels");
+				goto error;
+			}
 			JANUS_LOG(LOG_VERB, "%s is calling %s\n", session->account.username, uri_text);
 			JANUS_LOG(LOG_VERB, "This is involving a negotiation (%s) as well:\n%s\n", msg->sdp_type, msg->sdp);
 			/* Clean up SRTP stuff from before first, in case it's still needed */