Added Error framework (missing QueryErrors)