Hmm perhaps turn this into a separate except clause?