Added TODO
Writting exceptions to logger
Corrected comment