Index: src/main/java/common/javax/swing/border/MatteBorder.java =================================================================== --- src/main/java/common/javax/swing/border/MatteBorder.java (revision 543122) +++ src/main/java/common/javax/swing/border/MatteBorder.java (working copy) @@ -46,11 +46,13 @@ } public MatteBorder(final Icon tileIcon) { - super(tileIcon.getIconHeight(), tileIcon.getIconWidth()); + // null vervfication has been added according to HARMONY-2589 + super((tileIcon == null) ? -1 : tileIcon.getIconHeight(), + (tileIcon == null) ? -1 : tileIcon.getIconWidth()); + + this.tileIcon=tileIcon; + } - this.tileIcon = tileIcon; - } - public MatteBorder(final int top, final int left, final int bottom, final int right, final Icon tileIcon) { super(top, left, bottom, right);