Trying to squash nil class issue
Fix for nil class