Replaced error handling that was mistakenly lost during a merge.
Authored by: ndzwill 2015-02-06
Parent: [r8043]
Child: [r8045]