Attempted to fix a rare double-message glitch

Switched the order of some statements around to try and prevent an
occasional glitch that creates two messages when you fall off the stage.
Unsure whether the glitch is fixed because it's already an extremely rare
glitch I don't know how to intentionally reproduce.
Merge branch 'kpam-iter4'
Merge branch 'master' into kpam-iter4