fix leak of received amounts

I noticed that my implementation of #1683 didn't block every access to the received amounts, this PR is an attempt to plug those holes.