Better ex handling in dispatch