Added organisations to config
Changed exit() to return in main()