Initial error handling for loading operations.
Merge branch 'master' into mymaster