Issue 7940 by tj: Always return a result