Handle a possible nil committeeId. Fixes #406.