Enhance exceptions and outputs