prevents exception when the the ShortcutSuiteName is null
* refactoring and reformatting shortcutSuiteName fix