V1.16
Improved error handling when loading files