am e0371936: am e5deafe9: Merge "Check for null class of class"

* commit 'e03719362982b1e0e0bc0788c0bd39d0678b8dbc':
  Check for null class of class