Deal with missing IO in a better way
Findbugs fixes