small changes in preparation to fixing exceptions