Added a check to catch the misbehaving wandering base