Revert "None value fix"

This reverts commit c692c6524541f3f12f84dbff8582ae82172167b1.