Fixed a bug I introduced while removing exceptions, which caused the