Add trap for reporting data on debug builds and hardening for release build

I can't repro the case, so I've added a trap that detects it and requests more data on debug builds, and on release builds hardens the behaviour