Only check on fileName if it's there
Remove extra condition, left over