Fixing NPE introduced in the last check-in.