Added error handling.
Merge remote-tracking branch 'origin/master' into develop
Minor bug fix.