Add catch for null and streaming files