finish fixing exceptions