Refactor: simplify init code as exceptions are now thrown on higher level (OMS-372)