Fix for possible NPE if Bundle is stopped.

Change-Id: Iaf1d44f8b600e69392452b74042812b35e8101de
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Merge "Fix for possible NPE if Bundle is stopped."