FIXED - JENKINS-16453
added null check
finally returning flag value instead of false
removed exception handling
added a basic test
add email address properly if already known
Merge pull request #123 from richtmat/master

Fixing JENKINS-16453