Added check for defined header