Added some error logging to generic file and intel obj controllers
Merge branch 'develop' into feature/solr