Expection handling improved