Movement agent, fixed null exception, modifying plan use.