#123 clean up (execption handling)