even the non-errors. we should probably insert a BaseException here. Change-Id: I1b1af8ba0bf49251fe9d1a24c6559db3ef4a59d2