exceptions codes fixed