Include another safety check for empty cells.

Some renaming and cleaning up.
Added another check for EjectInAir attempts.