Added exception handling to call_layers
Merge branch 'master' of github.com:ziarrek/warlight