Made sure all errors now returned via ReturnError* macros.