[pangzero/f36] (2 commits) ...Fix "Can't call method "format" on an undefined value" errors (rf#6325)