Fix NPE with shop searching