Done more exception refactoring
Added more comments