Update image parser
Update error handling