TBH that was copied from one of the other property change handlers. Just the check for IsInitialized  should be enough, I'll update.