Changed error checking to auto-adjusting to correct