Patch for [SeeRM #8315]
Land #2254 - Fix TypeError can't convert nil into String

This fixes TypeError can't convert nil into String errors.