Use an elseif
Avoid deferencing NULL with execvp(3)

CID:	1241973