remove need for custom exception