fixing exceptions: NOT fixed