diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py
index 8c6b209e49..53c28fb74f 100644
--- a/ironic/conductor/manager.py
+++ b/ironic/conductor/manager.py
@@ -1538,7 +1538,7 @@ class ConductorManager(base_manager.BaseConductorManager):
                 raise exception.UnsupportedDriverExtension(driver=node.driver,
                                                            extension='console')
             if not node.console_enabled:
-                raise exception.NodeConsoleNotEnabled(node=node_id)
+                raise exception.NodeConsoleNotEnabled(node=node.uuid)
 
             task.driver.console.validate(task)
             return task.driver.console.get_console(task)
diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py
index 0cf24ee88a..b5bb119d3d 100644
--- a/ironic/conductor/task_manager.py
+++ b/ironic/conductor/task_manager.py
@@ -236,7 +236,7 @@ class TaskManager(object):
                                              self.node_id)
             LOG.debug("Node %(node)s successfully reserved for %(purpose)s "
                       "(took %(time).2f seconds)",
-                      {'node': self.node_id, 'purpose': self._purpose,
+                      {'node': self.node.uuid, 'purpose': self._purpose,
                        'time': self._debug_timer.elapsed()})
             self._debug_timer.restart()
 
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py
index 9c263c0945..c753908382 100644
--- a/ironic/db/sqlalchemy/api.py
+++ b/ironic/db/sqlalchemy/api.py
@@ -222,7 +222,7 @@ class Connection(api.Connection):
                 if count != 1:
                     # Nothing updated and node exists. Must already be
                     # locked.
-                    raise exception.NodeLocked(node=node_id,
+                    raise exception.NodeLocked(node=node.uuid,
                                                host=node['reservation'])
                 return node
             except NoResultFound:
@@ -239,9 +239,9 @@ class Connection(api.Connection):
                 if count != 1:
                     node = query.one()
                     if node['reservation'] is None:
-                        raise exception.NodeNotLocked(node=node_id)
+                        raise exception.NodeNotLocked(node=node.uuid)
                     else:
-                        raise exception.NodeLocked(node=node_id,
+                        raise exception.NodeLocked(node=node.uuid,
                                                    host=node['reservation'])
             except NoResultFound:
                 raise exception.NodeNotFound(node_id)
@@ -359,7 +359,7 @@ class Connection(api.Connection):
             # Prevent instance_uuid overwriting
             if values.get("instance_uuid") and ref.instance_uuid:
                 raise exception.NodeAssociated(
-                    node=node_id, instance=ref.instance_uuid)
+                    node=ref.uuid, instance=ref.instance_uuid)
 
             if 'provision_state' in values:
                 values['provision_updated_at'] = timeutils.utcnow()