Better handle case where password is in serialized_object