Merge "Fix for possible NPE if Bundle is stopped."