Fix for #485

I just removed the runtime exceptions