Started adding some exception handling