Fixes #297 - Optional assertions