BISERVER-8999 Fix exception on login.
Merge pull request #471 from jcaldwell/dev

BISERVER-8999 Fix exception on login.