Change catch to handle expected exception