more error-handling in Manager