Serve Error logic change