AttributeError: 'NoneType' object has no attribute 'encode' when using Havana's Heat

Change-Id: I6ebead61d4b9307927554a03fff2d7a86aaedf5b
Merge "AttributeError: 'NoneType' object has no attribute 'encode' when using Havana's Heat" into release-0.2