Exceptions added

More fiddlign.