[Windup-commits] [windup/windup] b1fa2f: added nulls check to solve NPE for WINDUP-789