Have added a check for this