BZ-13280 Handled initialization issues