Clean up a bit how we throw the Exception in FileHandler