I'd prefer to keep this check here and only add the additional check for chunking inside the below.
This will the chunking code more isolated - what I'd really appreciate as I have a branch which deals with chunking in it's own code block - THX