Removed null fileobjects (hopefully)