handle when there is no current class
Merge pull request #8 from guymers/current-class-null

handle when there is no current class