More test and parse error catch