Now raising exception when something is not found.
Also added a test for this.