Forgot to update this
Fixed bad execption catching