Specified exceptions

Shoftee's advice is always appreciated!