Bug #6025838 If a modifier is setup and not reset crashes can occur. Change-Id: I715524fb46928f1f06499cc1402499ef59f4a050