fixed issue with exceptions