JC-1449 - Error fixing