added excaption handling
Merge branch 'master' of https://github.com/mateusz93/Matrix