I am glad you decided to keep the current design. I am not as concerned as you are about possible db inconsistencies, but I see your point and will update the branch introducing the check.