use if instead of short-circuiting && or ||

use if instead of short-circuiting && or || #58