Don't crash if last_message is None
Merge branch 'master' into kingman