Use the error signal raising call not the hacky kludge that was in place.