Fix crash when quiver gets empty #625