Merge "Check for null class of class"