bad use of 'or' with return

Ooops.
maintenance  changes
v0.5.3

 [BUG FIXES]
 - Wrong use of 'or' with return. (Roy Tate)

 [STATISTICS]
 - code churn: 6 files changed, 76 insertions(+), 17 deletions(-)