Adding couple of rescue statements