Merge "Bugfix: Exception when adding static host"