Revert "Revert "Prevent an NPE""

This reverts commit 40197db4f04b759bbee976f83a7b32e559f45292.

Change-Id: If0c53c84fbdf6a54552f189752ab5bd4d8e8d8cf
1 file changed