#1071 - Fix NPE