Updated FileHandler to try to fix the EOF Exception