NoSuchValuesException was moved to QueryHandler.
Re-commit of un-commited changes.