General clean up. Added err response for when archive is empty