Issue #500

[2.0.0001] unable to get bbid token if Research In Motion folder doesn't exist
Merge pull request #551 from blackberry/next-500

Issue #500