null check on mock namespace check

@rev rjayaramappa@
Merging origin/gtorres/master-pending-mocknullnamespace into master