Fix exception when handling error, log errors better (cherry picked from commit d8d2e52e3f) Signed-off-by: Joshua Boniface <joshua@boniface.me>
d8d2e52e3f