DAR-2445: Added isset to if statement