nil check on username and domain
Merge pull request #61 from barmstrong/master

nil check on username and domain