Rebuilt check_puppet_wrapper