Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d am: bef0525c38 am: e4db3f0757
am: d7b61ca662

* commit 'd7b61ca6620565cad00de91284ecdfb93ddfbd50':
  Check NPE beforehand instead of catching it at runtime