Added exception instead of null return