[Design] Finished errror controls