Fixed final error handling.