Fix regression when setting resumeOnbroadcast. Turn on logging on exception, switch logic for now