Adding code 400 support