Fix null API responses

 * Fix null responses implied by 2639922 commit