improve responsiveness
handle null scenario