Small fix - exceptions are used now