re-move error handling code