Fix crashing

Please note that Andromeda now hangs on a black screen instead of crashing.