Simplify pfile handling in Warehouse.getFs and avoid an NPE