Merge "Fix NameError exception"