Re: #12 - Add a few safety checks before adding the global modules