* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e': aac: Make sure to set err on the failure path Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>