Improved error handling
Merge pull request #20 from aweiteka/cleanup

Improved error handling in dashboard