Modify Parser to terminate immediately on error (to be fixed later)