Fix the NPE when providing backward compabitility.