Error handling now working! :+1:

Also added spec for error-handling option