more work, now it at least crashes the way it should :)