Code: Null checkes. (#1216 and #1221)