Reorg error handling and textarea