minor fixes
Merge branch 'except_review' of http://github.com/rojblake/core into except_review
Fixed incorrect return