adding rescue back - otherwise initial commit may have issues