make travis happy

Hi @donaier / @effkay,

mostly some guard-stuff (aka "return early").

Thank you very much,
Alex