Remove error handling until stable