Handle null inboxes better