Fixed xfer state tracking, error handling, log msgs updated.

Change-Id: I294c6abd2930dd9bc54865341900a1956855617d