- added fallback for missing hostname
- adjust riskmanagement