Replaced return values with more exceptions