optimize short-circuit, remove debugging message