Fixed 002 and 003 for a bit of error handling