raise the error correctly
Merge branch 'development' of github.com:cuckoobox/cuckoo into development