diff --git a/channels/chan_local.c b/channels/chan_local.c
index 4e0316670dcff07d4e460ac1ee5e43a86dc2c513..da86e14733dcc13ddbf8fe3ed977d8b878a11112 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -311,15 +311,20 @@ static int local_devicestate(const char *data)
 	res = AST_DEVICE_NOT_INUSE;
 
 	it = ao2_iterator_init(locals, 0);
-	while ((lp = ao2_iterator_next(&it)) && (res == AST_DEVICE_NOT_INUSE)) {
-		if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) {
-			ao2_lock(lp);
-			if (ast_test_flag(lp, LOCAL_LAUNCHED_PBX)) {
-				res = AST_DEVICE_INUSE;
-			}
-			ao2_unlock(lp);
+	for (; (lp = ao2_iterator_next(&it)); ao2_ref(lp, -1)) {
+		int is_inuse;
+
+		ao2_lock(lp);
+		is_inuse = !strcmp(exten, lp->exten)
+			&& !strcmp(context, lp->context)
+			&& lp->owner
+			&& ast_test_flag(lp, LOCAL_LAUNCHED_PBX);
+		ao2_unlock(lp);
+		if (is_inuse) {
+			res = AST_DEVICE_INUSE;
+			ao2_ref(lp, -1);
+			break;
 		}
-		ao2_ref(lp, -1);
 	}
 	ao2_iterator_destroy(&it);
 
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0dc6069c8d395254a77376f6d3b41f40c2c5f1e7..30177d1951964bb73d3d18a01888258f590e20b2 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -17897,7 +17897,7 @@ static void check_via(struct sip_pvt *p, struct sip_request *req)
 		if (ast_sockaddr_resolve_first(&tmp, c, 0)) {
 			ast_log(LOG_WARNING, "Could not resolve socket address for '%s'\n", c);
 			port = STANDARD_SIP_PORT;
-		} else if (!(port = ast_sockaddr_port(&tmp)) {
+		} else if (!(port = ast_sockaddr_port(&tmp))) {
 			port = STANDARD_SIP_PORT;
 			ast_sockaddr_set_port(&tmp, port);
 		}