Removes return statement because it breaks sometimes.
Removes bad check.
Merge pull request #1 from Springest/fixes

Removes return statement because it breaks sometimes.