Handle non existing and empty dirs