Throw more npes for null worlds, to ensure things blow up in time.
Remove direction correction, as it does not seem to be effective.