Added empty field check