Added error handling - or not handling at all