[Bugs] Improve input null issue