base

Cleanup for bug 5278763

Variable is not needed, and removing unneeded check

Also throwing an exception if sContext gets set to null.

Change-Id: Ic61ba4c88a162eb730e166f0e9f477e809b51f42