XXX - loging exceptions, need to sqash