Fixed badReturn not being used