Speed up requery on incoming message

fixes #2008
More strictmode stuff when debug flag is on