diamond: Don't choke on puppet syntax error failures

Change-Id: Ie6b2b025889269f58694387cdd5843c485b75b8e