I found this solution very helpful and it fixed a problem we ran into, so thanks!
Do you have any more details as to what exactly this fixes the problem? Can you clarify what the [NoTrap] section is defining? Why it's missing to begin with?
I would fine any details on this very interesting.