Use match instead of if-else to unpack ptr from Option

Use match instead of if-else to unpack ptr from Option #243