added :raise_error => true/false option