[TIMOB-16897] Avoid NullPointer Exception
[TIMOB-17017] Override editor behavior only if property is specified