Handle NPE

[thachlp]

Issues: #2596

Make sure that:

• You have read the contribution guidelines.
• You have created a feature request first to discuss your contribution intent. Please reference the feature request ticket number in the pull request.
• You applied code formatting rules using the mvn formatter:format target. Don’t submit any formatting related changes.
• You submit test cases (unit or integration tests) that back your changes.

[tishun]

Could you also please provide some unit/integration tests that check for this condition?

[thachlp]

Could you also please provide some unit/integration tests that check for this condition?

@tishun I add the test for my change, please help review it 🙇

[tishun]

Awesome, appreciate your help with that!