am 7f7dbaa2: Improve detection of incomplete encryption

* commit '7f7dbaa2784c10fd2989fb303e5edfb8136d53dc':
  Improve detection of incomplete encryption