throw error instead of returning null /cc @drsnyder