Add error-handling
Add host assertion