Yes - I think that would be worthwhile as it will clean up the srvcgi.cpp file further - although leave s_default_error_handler for now - we've not updated MCScriptPoint yet, and that's just a script that's passed to that as a constant c-string.