Fix bug 724590, which crashes g-or-scanner.