Removed error throw per satazor