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
* commit 'e4db3f07':
Check NPE beforehand instead of catching it at runtime