Add missing false return value and protection against empty fields winning situation