Added isset() checks to avoid Notices.