Now that Handler can be notified with empty chunks, I feel safer with this, see #428