Add a try catch to handle tokenInput not loading
Merge remote-tracking branch 'upstream/master'

Merged remote changes
Merge pull request #50 from splinter/master

Fix for not been able to add assets in tenant mode