Merge "Fix NPE & other issues"