Merge "Guard against non-object returns from File::getHander()"