DPC-197 - check isset first