Fixing crash when bad custom address is given
Merge pull request #26 from wpeter-sfdc/unstable

Fixing crash when bad custom address is given