Added short circuit to control statement