Add comment about not using Nullable
Add more asserts