fixing exceptions in progress