19.10.2012 - Fixed error handling.
