Error handling modified a little