Now handles errors better
1.1.0