More dialogs in case of error
Better error handling
Merge branch 'master' of https://www.github.com/oVooVo/CAN