Fix NPE with unresolved unresolved addresses