Git error handling in prep/custom (Fixes #42)