am 21e57216: Merge "Fix a possible NPE in Dicttool"

* commit '21e57216e15d236764a5e00ca5614ec67d23159f':
  Fix a possible NPE in Dicttool