Corrected the builder.
Error handling now works completely as expected.