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

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