Get rid of explicit nil check in favor of guards