Added check for mapper