I have made required change , will return current name in these cases instead of Null :)