Fixed my spec env, added guard.
Dropped the exceptions, added a spec.