Add checks for null and streaming files
Update version