Fixes #2013 --> Undefined index: host

Signed-off-by: margarett <bruno.m.alves@gmail.com>
Merge pull request #2210 from margarett/release-2.1

Fixes #2013 --> Undefined index: host