Fix each place we're erroring out but return a value as the
methods are int returns

Resolves issues pertaining to #303
Merge branch 'hotfix/fix_return_values'