Guarding against 'null' file list correctly