Changed order of code as error was sometimes thrown.
Changed order of code as error was sometimes thrown.

PeterRock/Ci-Bonfire3,PeterRock/Ci-Bonfire3,kelaskakap/cms-api-unggun,kelaskakap/cms-api-unggun,PeterRock/Ci-Bonfire3,kelaskakap/cms-api-unggun