Now throwing a custom exception
More work on tests