exceptions fixing