Removed some returns uneccessary after new exceptions