fix NPE in locaton rebinding