Fixes dependency propagation of exceptions