Fixing issue in "already initialised" handling and adding better logging.