Merge "From IAN, fix NPE (accidentally abandoned)"