Rev version. Null check.

Change-Id: I2ff1c61c138ca24f6717edac0d40efe52fd88294