Added comments
Fixed NPE appearing in some cases (depending on how the window is constructed)
Fixed NPE appearing in some cases (depending on how the window is constructed)
Quick workaround for use in JFormDesigner