Add some error handling
Remove empty line
Add new TODO