Update error handling and fix act params