Fixed handleException calls