Error handling and variable declaration modifications
Authored by: goiarbide 2012-12-14
Parent: [r210]
Child: [r212]
