fix variable names
adding real exceptions while parsing