Add null check for add/remove truck