Fix error handling for file includes.
Autocommit: libraries changed 2014-06-04-13:24:00