Ensure NotFound message is sent back at the appropriate time.