Query controller changed - error checking