Hacked to work on intermittent spec failure of 2 specs
Replaced nil error-handling with objects inheriting from StandardError