Error handler now just returns what was given to it.