Merge remote-tracking branch 'origin/develop' into develop
Added error handling routine.
Merge branch 'topic-read-from-file-revised' into develop