Fixed a fatal error.
Maybe better unhandled exception handling
More betterer error handling
Merge branch 'test' of github.com:kellyelton/OCTGN into test