Update syntax and error handling