Merge pull request #2834 from coling/master

diff --cc src/core/device.c
index d201dc5e4bb225023fbda06e57d951e407fdd126,c64e01c2aad6614d7d4ac5296a2213b9f0ac30fc..28e4039da20084dd77e2ec38685257e3029aa435
--- 1/src/core/device.c
--- 2/src/core/device.c
+++ b/src/core/device.c
@@@ -318,7 -318,7 +318,7 @@@ static int device_setup_unit(Manager *m
           * the GC to have garbaged it. That's desired since the device
           * unit may have a dependency on the mount unit which was
           * added during the loading of the later. */
-         if (u && DEVICE(u)->state == DEVICE_PLUGGED) {
 -        if (sysfs && u && DEVICE(u)->state == DEVICE_PLUGGED) {
++        if (dev && u && DEVICE(u)->state == DEVICE_PLUGGED) {
                  /* This unit is in plugged state: we're sure it's
                   * attached to a device. */
                  if (!path_equal(DEVICE(u)->sysfs, sysfs)) {