Remove dependecy on JRSwizzle
Handle error in method swizzling