adapt specs to changes
refactor exception call