Removing unnecessary error & returns. Thanks Max!