Returning null for triggers in the correct place, fixes #2083
Merge branch 'issue/2083' into develop