Added support for null filename and file url