This previously threw NullPointerException, but has been fixed by commits that have since been applied.