fix npe on move