Fix possible loop in file_count
Fix goto error
vade: Support exceptions