Passing null files through
Added a clone option