Incorporate better handling of common errors.