Fix to test non-optionals when type comparing.
Fix to test non-optionals when type comparing.

jonkykong/SideMenu,pidjay/SideMenu,ealeksandrov/SideMenu,ealeksandrov/SideMenu,pidjay/SideMenu,pidjay/SideMenu,jonkykong/SideMenu