Update copyright info
Fixed error handling on cli