fix exceptions hopefully