Better handling of empty/incomplete content stream