Handle nil in :pretty_value before escaping
Merge branch 'xss'