Fixed source of unhandled error
merged files