Changed error codes to return where you were