added nil check for inter modal transfers