[3] Improved error checks
https://sourceforge.net/tracker/?func=detail&aid=3528992&group_id=624136&atid=2789445
Authored by: robbod 2012-05-25
Parent: [r596]
Child: [r598]