added Error handling