Update with better error handling.
Release 0.6.6