am 932ec21b: Merge "Null check; back behavior" into jb-dev

* commit '932ec21b60a7829e0535b105172045daaed3278e':
  Null check; back behavior