Additional fixes for IOExceptions. See https://trello.com/c/4rdEwSXh