Added some error messages
Merge branch 'master' of https://github.com/Snie/BPMetrics_Usi2014