Exceptions thrown by the calculator are now handled properly