removed strict mode, reset caller to null in some cases

Change-Id: I34075dab7665345af8c99072dea06b8abe24793c