Some temporary, I hope, fixes, making error handling working more correctly.
Authored by: gyver309 2007-03-15
Parent: [r9260]
Child: [r9262]