diff --git a/src/services/invoice.service.js b/src/services/invoice.service.js
index 983983d..3b4afdf 100644
--- a/src/services/invoice.service.js
+++ b/src/services/invoice.service.js
@@ -1,4 +1,5 @@
 import storage from 'localforage';
+import TeamService from '@/services/team.service';
 import { validate, generateInvoiceNumber } from '@/utils/helpers';
 import dayjs from 'dayjs';
 
@@ -14,7 +15,7 @@ class InvoiceService {
   }
 
   async createInvoice(invoice) {
-    const team = storage.getItem('team');
+    const team = await TeamService.getTeam();
 
     const invoices = await this.getInvoices();
 
@@ -23,8 +24,7 @@ class InvoiceService {
     invoice.due_at = dayjs()
       .add(14, 'days')
       .format('YYYY-MM-DD');
-    invoice.number = generateInvoiceNumber(dayjs()
-      .format('YYYY'), invoices.length + 1);
+    invoice.number = generateInvoiceNumber(invoices);
     invoice.late_fee = 0.5;
     invoice.from_name = team.company_name;
     invoice.from_address = team.company_address;
@@ -49,7 +49,7 @@ class InvoiceService {
   }
 
   async updateInvoice(invoice) {
-    const necessaryFields = {
+    const requiredFields = {
       currency: 'Currency',
       vat_rate: 'Vat Rate',
       late_fee: 'Late Fee',
@@ -58,15 +58,14 @@ class InvoiceService {
       number: 'Number',
     };
 
-    const validation = validate(necessaryFields, invoice);
-
-    if (validation.length === 0) {
-      const invoices = await this.getInvoices();
-      const index = invoices.findIndex(item => item.id === invoice.id);
-      invoices[index] = invoice;
-      return storage.setItem('invoices', invoices);
+    const errors = validate(requiredFields, invoice);
+    if (Object.keys(errors).length > 0) {
+      return Promise.reject(errors);
     }
-    return Promise.reject(validation);
+    const invoices = await this.getInvoices();
+    const index = invoices.findIndex(item => item.id === invoice.id);
+    invoices[index] = invoice;
+    return storage.setItem('invoices', invoices);
   }
 
   async deleteInvoice(invoiceId) {
@@ -77,7 +76,7 @@ class InvoiceService {
   }
 
   async bookInvoice(invoice) {
-    const necessaryFields = {
+    const requiredFields = {
       currency: 'Currency',
       vat_rate: 'Vat rate',
       late_fee: 'Late fee',
@@ -110,13 +109,13 @@ class InvoiceService {
       },
     };
 
-    const validation = await validate(necessaryFields, invoice);
-
-    if (validation.length === 0) {
-      invoice.status = 'booked';
-      return this.updateInvoice(invoice);
+    const errors = await validate(requiredFields, invoice);
+    if (Object.keys(errors).length > 0) {
+      return Promise.reject(errors);
     }
-    return Promise.reject(validation);
+
+    invoice.status = 'booked';
+    return this.updateInvoice(invoice);
   }
 }
 
diff --git a/src/store/invoices.js b/src/store/invoices.js
index 20f0ffc..4fc67e2 100644
--- a/src/store/invoices.js
+++ b/src/store/invoices.js
@@ -131,7 +131,7 @@ export default {
       commit('clearErrors');
 
       return InvoiceService.updateInvoice(getters.invoice)
-        .catch(err => commit('setErrors', err.response.data.errors));
+        .catch(err => commit('setErrors', err.errors));
     },
     async deleteInvoice(invoice) {
       const res = await InvoiceService.deleteInvoice(invoice.id);
@@ -161,11 +161,9 @@ export default {
       commit('clearErrors');
 
       try {
-        console.log('tryBookInvoice');
         const res = await InvoiceService.bookInvoice(getters.invoice);
         return dispatch('getInvoice', res.invoice_id);
       } catch (err) {
-        console.log(err);
         commit('setErrors', err.errors);
       }
     },
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index 6687980..be89980 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -1,4 +1,6 @@
 /* eslint-disable */
+import dayjs from '../services/invoice.service';
+
 export function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0,
@@ -32,25 +34,42 @@ export function pick(obj, map) {
 }
 
 
-export function validate(neededFields, fieldsToValidate) {
-  const validationErrors = {};
+export function validate(requiredFields, input) {
+  const errors = {};
 
-  for (const [key, value] of Object.entries(neededFields)) {
-    if (Array.isArray(fieldsToValidate[key])) {
-      fieldsToValidate[key].forEach((item) => {
+  for (let [key, value] of Object.entries(requiredFields)) {
+    if (Array.isArray(input[key])) {
+      input[key].forEach((subInput, index) => {
+        for (let [subKey, subValue] of Object.entries(value)) {
+          const error = validateField(subInput, subKey, subValue);
+          if (error) {
+            errors[`${key}.${index}.${subKey}`] = error;
+          }
+        }
       });
-    }
-    if (!fieldsToValidate.hasOwnProperty(key) || !fieldsToValidate[key] || fieldsToValidate[key].length === 0) {
-      validationErrors[key] = [`Field ${value} is required`];
+    } else {
+      const error = validateField(input, key, value);
+      if (error) {
+        errors[key] = error;
+      }
     }
   }
 
-  console.log('errors', validationErrors);
-  return { errors: validationErrors };
+  return { errors };
+}
+
+export function validateField(input, field, label) {
+  if (!input.hasOwnProperty(field) || !input[field] || input[field].length === 0) {
+    return [`${label} is required`];
+  }
+  return null;
 }
 
 
-export function generateInvoiceNumber(date, number) {
+export function generateInvoiceNumber(invoices) {
+  const date = dayjs()
+    .format('YYYY');
+  const number = invoices.length + 1;
   return `${date}-${number}`;
 }