minor changes: renamed method, adapted exception message