Mike, I've made a note in bug 870726 to revisit the UX issue here, but meantime, landed this patch to fix the crash.