- Attempt to fix an exception, needs intensive testing to replicate
- Added License terms on the root folder