Update Rest Client and fix NPE in controller