Crash fixes

Hi all,

This update should fix crashes when receiving a new ship.

Cheers,
Steve.