Fix NPE during gear delete