check null for debug conf
Merge branch 'develop'