Fix potential bug in catchall.