fixed toEmail panic when no client exist
cleanup
Merge pull request #428 from jprobinson/master

toEmail bugfix