Moved around handle validation and added validation overriding.