Added test and patched a little further for null src