Or should that even be an assert() to force callers to fix things? Change-Id: Ie0f10394376f088a7af9399ee42503fc403ca094