fixed crash when saving organisation change