Now throws exceptions
Fixed major error