Fix typo
Change include files
Add exception handling
Refactoring