added rooms query to burnhilde
optimized errorhandling