- performance improvements on error checking