PFS-1140 #resolve #comment more logging and check if file is null