Changed exception handling & added license file headers based on pull request feedback