added return values to cover all situations.

Will probably need a nicer way to do that maybe with a variable initialised with [-1,-1,-1,-1] at the start.