Dev works with errors validation

please don't merge until release-1.1.24.x is out.