Remove deprecated jackson calls and fix NPE