finally added second nonce=null handling