I've retained the original code here (which had this catchall rescue). While this needs to be addressed, I'm not sure 
1. what is the best exception type to catch here
2. that this needs to be addressed in this patch