CRM-15613 - Fix access to undefined property error