Added error handling for that scenario in the https://github.com/SharadGandhi/naarad/commit/b642d766a56f99d3f8a9c3b5f65f1a58df7247d6 commit