Fix return inconsistent return points

Fix for inconsistent return from method given invalid inputs. Now all paths return `this`.