diff --git a/src/index.ts b/src/index.ts
index a249ce58..d8030db7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -219,8 +219,8 @@ export class TypeScriptPlugin {
     const { service } = this.serverless
 
     await fs.copy(
-      path.join(this.originalServicePath, BUILD_FOLDER, SERVERLESS_FOLDER),
-      path.join(this.originalServicePath, SERVERLESS_FOLDER)
+      path.join(this.originalServicePath, SERVERLESS_FOLDER),
+      path.join(this.originalServicePath, BUILD_FOLDER, SERVERLESS_FOLDER)
     )
 
     if (this.options.function) {
@@ -245,7 +245,7 @@ export class TypeScriptPlugin {
       return
     }
 
-    service.package.artifact = path.join(
+    service.package.artifact = service.package.artifact && path.join(
       this.originalServicePath,
       SERVERLESS_FOLDER,
       path.basename(service.package.artifact)