Better handling of signature expiration