Increased strength of checks on set to complete and incomplete logic