Ensure all excluded shaded artifacts are resolved, and correctly handle null classifier