Added support for null expiration dates (permanent keys)