Merge branch 'master' into patched-master

1 files changed, 1 insertions, 1 deletions

diff --git a/otr.c b/otr.c
index d2c1a2f2..2a2385ce 100644
--- a/otr.c
+++ b/otr.c
@@ -1513,7 +1513,7 @@ struct im_connection *check_imc(void *opdata, const char *accountname,
 				break;
 			}
 		}
-		assert(l != NULL);  /* a match should always be found */
+		g_return_val_if_fail(l, NULL);
 		if (!l) {
 			return NULL;
 		}