Raise early instead of passing nil

Will make errors a bit less confusing