diff --git a/.version b/.version
index 34b153ef60..f5a5dc7371 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.8.8.1
+1.8.8.2
diff --git a/ChangeLog b/ChangeLog
index d02c5a6a93..1c9988156b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-19  Asterisk Development Team <asteriskteam@digium.com>
+
+	* Asterisk 1.8.8.2 Released.
+
+	* AST-2012-001
+
 2011-12-30  Asterisk Development Team <asteriskteam@digium.com>
 
 	* Asterisk 1.8.8.1 Released.
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 60843698f7..8401054b69 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28977,6 +28977,12 @@ static int setup_srtp(struct sip_srtp **srtp)
 
 static int process_crypto(struct sip_pvt *p, struct ast_rtp_instance *rtp, struct sip_srtp **srtp, const char *a)
 {
+	/* If no RTP instance exists for this media stream don't bother processing the crypto line */
+	if (!rtp) {
+		ast_debug(3, "Received offer with crypto line for media stream that is not enabled\n");
+		return FALSE;
+	}
+
 	if (strncasecmp(a, "crypto:", 7)) {
 		return FALSE;
 	}