Bug fix: NPE issues reported by users