Made expiry only happen server side now and throw exception if it happens