Fix nullable=false bug

Change-Id: Iaa5c46a73377c2cab0a7a19ab85c684f685e0ecc