am ceaafa2f: Merge "Do not throw NPE if the dictionary info is not available on db"

* commit 'ceaafa2ff99fd881b5fa6053734a7e38a594638f':
  Do not throw NPE if the dictionary info is not available on db