Fix behavior on SpotlightException