Add error handling in Sohoa