Laurentiu Cocanu <laurentiu.cocanu@zylin.com> - Added additional error checks mostly...