JBIDE-13896 Preparation for possible addition of management bundle

removed code duplication and excessive try/catch blocks