Feature/gestion null