Bug fix for crashes caused by '--search --exclude-sysdbs --current-db'