Update to decorator and NPE's.