Switching to Error objects
Reving to 0.6.1