am 1b5030f6: (-s ours) am 65370e37: Check for null class of class

* commit '1b5030f60fc87f8c374e3dc417090336409ba2b5':
  Check for null class of class