mardiros Use ok_or instead of is_none

Latest commit 85f2709

Nov 1, 2018