Debug

Change-Id: Ib21ffc7a8a5ceea90b17018bec7dc6ef5e8fbe2b
Debug

Change-Id: I9b83788402bfc21a4823324319e236b2b52492e0
Debug

Change-Id: If5db3f611532ae04885ff26d074687e0dc8d996f
Debug

Change-Id: I6f6b8c6d506ff71db134aae715bf17b37531dcbf
Added error checks

Change-Id: I8803410f9a3d21e6f3f1c33bfaddf0c2e8fff1a9


Change-Id: I2fa8a9670ef09429ea379d4a1862e5821e7fb05a