FS-3685 more issues

src/mod/endpoints/mod_sofia/sofia_presence.c

@@ -3227,10 +3227,11 @@ void sofia_presence_handle_sip_r_subscribe(int status,
 		gw_sub_ptr->state = SUB_STATE_FAILED;
 
 		if (sofia_private) {
+			if (sofia_private->gateway->sub_nh) {
+				nua_handle_bind(sofia_private->gateway->sub_nh, NULL);
 				nua_handle_destroy(sofia_private->gateway->sub_nh);
 				sofia_private->gateway->sub_nh = NULL;
-			nua_handle_bind(sofia_private->gateway->sub_nh, NULL);
-			sofia_private_free(sofia_private);
+			}
 		} else {
 			nua_handle_destroy(nh);
 		}