diff --git a/src/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts
index 42d3e2a..dc8e765 100644
--- a/src/clients/inputs/client.service.ts
+++ b/src/clients/inputs/client.service.ts
@@ -42,14 +42,15 @@ export class InputsClientService implements OnModuleInit {
     console.log('InputClientService', 'Create');
     const { info, ...data } = createInputGeneric;
     data.credentials = await this.getInputTokens(data);
-    data.options ? delete data.options : null;
-    data.credentials.oauth_code ? delete data.credentials.oauth_code : null;
+    if (data.options) delete data.options;
+    if (data.credentials.oauth_code) delete data.credentials.oauth_code;
     const grpcPayload = {
       input: EncodeJsonToGrpcStruct(data),
       info,
     };
+
     const structPayload = await lastValueFrom(
-      this.inputService.Create(objectSnakeToCamel(grpcPayload)),
+      this.inputService.Create(grpcPayload),
     );
     objectCamelToSnake(structPayload);
     return DecodeGrpcStruct(structPayload.input);
@@ -57,26 +58,14 @@ export class InputsClientService implements OnModuleInit {
 
   async createS3Inputs(createInputDto: InputCreateS3Request) {
     console.log('InputClientService', 'Create');
-
-    const createInputResponse = await new Promise((resolve, reject) => {
-      this.inputService.CreateS3(objectSnakeToCamel(createInputDto)).subscribe({
-        next(x) {
-          resolve(objectCamelToSnake(x));
-        },
-        error(err) {
-          console.log('Observable Error');
-          reject(err);
-        },
-        complete() {
-          console.log('done');
-        },
-      });
-    })
-      .then((res) => res)
-      .catch((err) => {
-        throw new Error(err);
-      });
-
+    objectSnakeToCamel(createInputDto);
+    const createInputResponse = await lastValueFrom(
+      this.inputService.CreateS3(createInputDto),
+    ).catch((e) => {
+      throw new HttpException(e.details, 500);
+    });
+    console.log('done');
+    objectCamelToSnake(createInputResponse);
     return createInputResponse;
   }