Updated error message & removed stale comment