Prevent possible NullPointerException when service is destroyed

Bug: 18757778
Change-Id: Iaf2c8e41a5733379d171f58a35d09c506080fe5d
1 file changed