backport from trunk (rev #9653):
fix returning NULL if json is not found