Werk #2230: Fix two exceptions in case of errors during bulk discovery

Component	Setup
Title	Fix two exceptions in case of errors during bulk discovery
Date	May 19, 2015
Level	Prominent Change
Class	Bug Fix
Compatibility	Compatible - no manual interaction needed
Checkmk versions & editions	1.2.7i1 Checkmk Community, Checkmk Pro, Checkmk Ultimate MT

To the list of all Werks