Fixed NullPointerException in ModificationTracker