Missing return was causing nil pointer error.
Merge pull request #280 from jaredbischof/master

Missing return was causing nil pointer error.