Return correct http status code & message, fix #87