Strike that.  After fixing the onCancel / onListen like you asked above, this check is no longer needed.