Better comments
Also log exceptions