Empty field check added