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

handle when there is no current class