am 65370e37: Check for null class of class

* commit '65370e37b3fd9e53e3c1bce5757912e8309cd305':
  Check for null class of class