BUGFIX: raise on fail