Fix for null conceptId

Fix for null conceptId