Fix for dep cloud registration NullPointer issue