Implemented Binod's null fix
Altered context requirements