Code style
Code style
Error handling improved