Some protection. From the nullers.

Change-Id: I500be2d5bac921178f1744bc90caa53578a0c79b
preparing for v122 release

Change-Id: I18e41a2d45d2cdb9f9f4f18892256cc6738d942a