forgot lina, added error handling
Merge pull request #453 from Galithil/master

forgot lina, added error handling