- send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account));
- if (modest_tny_send_queue_sending_in_progress (send_queue))
- tny_send_queue_cancel (TNY_SEND_QUEUE (send_queue),
- TNY_SEND_QUEUE_CANCEL_ACTION_REMOVE,
- NULL);
- modest_runtime_remove_send_queue (TNY_TRANSPORT_ACCOUNT (account));
+ send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account), FALSE);
+ if (send_queue) {
+ if (modest_tny_send_queue_sending_in_progress (send_queue))
+ tny_send_queue_cancel (TNY_SEND_QUEUE (send_queue),
+ TNY_SEND_QUEUE_CANCEL_ACTION_REMOVE,
+ NULL);
+ modest_runtime_remove_send_queue (TNY_TRANSPORT_ACCOUNT (account));
+ }