         samePathOnly : yes
 
       machine.fs.create folderOptions, (err, folder) =>
-        return IDE.helpers.handleWorkspaceCreateError_ eventObj  if err
+        return IDE.helpers.handleWorkspaceCreateError_ eventObj, err  if err
 
         filePath   = "#{workspace.rootPath}/README.md"
         readMeFile = FSHelper.createFileInstance { path: filePath, machine }
 
         readMeFile.save IDE.contents.workspace, (err) =>
-          return IDE.helpers.handleWorkspaceCreateError_ eventObj  if err
+          return IDE.helpers.handleWorkspaceCreateError_ eventObj, err  if err
 
           eventObj.emit 'WorkspaceCreated', workspace
 

    { computeController, router } = KD.singletons

    if not name or not machineUId or not eventObj
      warn 'Missing options to create a new workspace'
      return IDE.helpers.handleWorkspaceCreateError_ eventObj

    machine = m for m in computeController.machines when m.uid is machineUId
    layout  = {}
    data    = { name, machineUId, machineLabel, rootPath, layout }

    unless machine
      warn "Machine not found."
      return IDE.helpers.handleWorkspaceCreateError_ eventObj

    KD.remote.api.JWorkspace.create data, (err, workspace) =>
      return IDE.helpers.handleWorkspaceCreateError_ eventObj  if err

      folderOptions  =
        type         : 'folder'


  handleWorkspaceCreateError_: (eventObj, error) ->

    eventObj.emit 'WorkspaceCreateFailed', error
    KD.showError "Couldn't create your new workspace."
    warn error
