Added missing traps
Merge pull request #829 from EPuncker/master

Added missing traps