No longer saving download client for entire the life cycle
Fixed error detection for SAB