Refactoring: dropping NoCallsStoredError