Ensure nil image doesn't break notifications

Fix #500, #506 & #507