Burying the Airship Glitch?

I suspect BNW fixes this bug accidentally by just returning the player to the title screen upon death. If retaining EXP gained prior to a game over isn't a desired behaviour, you could probably fix the airship glitch in the same way.

Another way to prevent the glitch may be to have the prompt to find the Floating Continent anywhere *but* the airship. It's not entirely intuitive, and certainly less convenient, but it would force the player to land before going back to the Floating Continent.

If you're looking for more technical ideas, I'm not the guy for that.