Avoid attempting to treat None as a string
Merge remote-tracking branch 'origin/new_homestead_api' into new_homestead_api