Error Handler Fix.