EX-92 (cgates): Fix normalize.
Added top-level try catch to fail more gracefully. Fixed merge to fail
gracefully when specified dirs not exist.