Handle the situation where file_content is not set
    
    There is at least one situation where file_content was not being set.
    This was reported to us by email and we're fixing it here.
    
    Add unit-tests for this change