Fixed: don't expire if expiry time is not set