Quick fixup to prevent operation on nulls