Fix issue with validation loop during settings handler save