Improved nonce verification