Issue #18: ensure we always return a value