Merge "Cleaned up a few exceptions and IDE errors in BagOStuff"