Add excepts

meh, I hope this works