* Adding better exception handling relevant to DAP