Pulled out the exception-on-null-value behaviour to a decorator
Fixed the pure-Java test