Added error checks
https://sourceforge.net/tracker/?func=detail&aid=3528992&group_id=624136&atid=2789445
Authored by: robbod 2012-09-19
Parent: [r1120]
Child: [r1122]