Bug fix - checks for a null object
Merge branch 'master' of https://jonvitale@github.com/WISE-Community/WISE.git