DDF-186 added source id to returned json and fixed potential null pointer