#JC-1675
* Added test and add error action