Parser INVALID catch improvements