fix exceptions again