Add final error control