Fix to only detect if $pod is null, same for $id