Fix bug in convert class that wasn't handling nullable types when checking for null