error handling for missing bugs
Merge branch 'master' of https://code.google.com/a/google.com/p/turkeydinner

Conflicts:
	shared.js