fixing some issues
some fix to handle better parsing error