Avoid adding null req/res properties to messages