Fix bug where not all methods branches returned an explicit value. This caused the caller method to think that an error occured (mistakenly)