Stopgap fix to avoid using a null CGContext

Change-Id: I445f09dd842b62e5153c53bb5af066af71d492bd
Add two more CG_TRACEs

Change-Id: Ib1ab15a0daa9e8cc1f48e6ff1b212b463fcb0004