nishi, indraneel | #925 | adding null checks in initialization