Improve error messages from batch controller. Simplify controller config