Error handling
Ready to merge viky's branch