Changed to generic 404 handler
Manual merge of jphastings error-block