Handle empty/too short traces better

Fixes some cases of #18