Added error handling to ActionBase