Added addition error handling