Minor improve : Use isNullOrEmpty to perform string checks