Add some better exception handling
Reaffirm License on main class