Error form fix up