BLK-222 Removes assertion and simplifies/clarifies logic.

Signed-off-by: Oren Leiman <oleiman@neutral.io>