Removing Exceptions to test API