Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev...
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d am: bef0525c am: e4db3f07
am: d7b61ca6
* commit 'd7b61ca6':
Check NPE beforehand instead of catching it at runtime