Merge "Fixes NullPointerException."