[Temp] Remove error handling