silly todo removed. Issue #15
added better error reporting: Issue #15