Simplify return processing
File name is always needed - ensure it is provided
Simplify return processing