Catch a less broad exception here?