Completed return command and better transaction protection