Added null pointer check
Refactored description provide to Navajo Core