Fix handling of nil class