Fixing NPE before calling unbind Test: CTS Bug: n/a Change-Id: I63584cc9b7c084df28da4113f871f865c81d4054