Resolved warnings detected by 'gradle check'
Added TODOs for exception handling