Feature #3: [Bug]NullPointerException corrected